diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2016-12-30 21:57:50 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-01-01 17:35:16 -0500 |
| commit | f37c7e01d551d111fc25e3a9a9f71d6654840941 (patch) | |
| tree | 83234ee5f706f342eaeb47cc016dfa229540baa9 /pkgs/misc/vim-plugins/patches | |
| parent | 2cac3742415a1fd32438be8bb4300a9ceb5d7dd6 (diff) | |
| download | nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar.gz nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar.bz2 nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar.lz nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar.xz nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.tar.zst nixlib-f37c7e01d551d111fc25e3a9a9f71d6654840941.zip | |
youcompleteme: fix compilation
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.
Diffstat (limited to 'pkgs/misc/vim-plugins/patches')
| -rw-r--r-- | pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch b/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch deleted file mode 100644 index fddf91b1c57c..000000000000 --- a/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch +++ /dev/null @@ -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() - |