public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

youcompleteme: fix compilation

Browse Source 
1) Replace --system-libclang with an explicit setting for the path to
nix libclang 3.9. Otherwise it will find system's libclang on darwin.

2) Remove clang/llvm from build inputs. This prevents ycm itself from
being compiled by clang 3.9. stdenv's standard compiler (gcc or
clang 3.7) will suffice.

3) Enable C++11 again as #16212 is caused by incopatibility between
clang 3.9 and libc++ 3.7, but we don't compile YCM with clang 3.9, so
this is not needed anymore.
This commit is contained in:
Dmitry Kalinkin
2017-01-01 17:35:16 -05:00
parent 2cac374241
commit f37c7e01d5
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch
-14
View File
@@ -1,14 +0,0 @@
--- ./third_party/ycmd/cpp/CMakeLists.txt
+++ ./third_party/ycmd/cpp/CMakeLists.txt
@@ -121,8 +121,8 @@
set( CPP11_AVAILABLE true )
endif()
elseif( COMPILER_IS_CLANG )
- set( CPP11_AVAILABLE true )
- set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )
+ #set( CPP11_AVAILABLE true )
+ # set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )
set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++" )
endif()