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

ycmd: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-02-14 00:27:12 +01:00
parent 0fe9b1e203
commit 07c21bfaf7
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
View File

@ -2,30 +2,19 @@ diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
index 2074c58e..9ecd6e57 100644 index 2074c58e..9ecd6e57 100644
--- a/cpp/ycm/CMakeLists.txt --- a/cpp/ycm/CMakeLists.txt
+++ b/cpp/ycm/CMakeLists.txt +++ b/cpp/ycm/CMakeLists.txt
@@ -366,35 +366,6 @@ if( LIBCLANG_TARGET ) @@ -335,7 +335,7 @@
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>" COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
) )
-
- if( APPLE ) - if( APPLE )
- # In OS X El Capitan, Apple introduced System Integrity Protection. + #if( APPLE )
- # Amongst other things, this introduces features to the dynamic loader # In OS X El Capitan, Apple introduced System Integrity Protection.
- # (dyld) which cause it to "sanitise" (and complain about) embedded # Amongst other things, this introduces features to the dynamic loader
- # LC_RPATH entries which contain @executable_path when then are loaded # (dyld) which cause it to "sanitise" (and complain about) embedded
- # into "restricted" binaries. For our purposes, "restricted" here means @@ -354,15 +354,15 @@
- # "supplied by Apple" and includes the system versions of python. For # simply strip the rpath entry from the dylib. There's no way any
- # unknown reasons, the libclang.dylib that comes from llvm.org includes an # @executable_path that python might have could be in any way useful to
- # LC_RPATH entry '@executable_path/../lib' which causes the OS X dynamic # libclang.dylib, so this seems perfectly safe.
- # loader to print a cryptic warning to stderr of the form:
- #
- # dyld: warning, LC_RPATH @executable_path/../lib in
- # /path/to/ycmd/libclang.dylib being ignored in restricted program
- # because of @executable_path
- #
- # In order to prevent this harmless and annoying message appearing, we
- # simply strip the rpath entry from the dylib. There's no way any
- # @executable_path that python might have could be in any way useful to
- # libclang.dylib, so this seems perfectly safe.
- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) - get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
- add_custom_command( TARGET ${PROJECT_NAME} - add_custom_command( TARGET ${PROJECT_NAME}
- POST_BUILD - POST_BUILD
@ -35,6 +24,14 @@ index 2074c58e..9ecd6e57 100644
- "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}" - "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
- ) - )
- endif() - endif()
+ # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
+ #add_custom_command( TARGET ${PROJECT_NAME}
+ # POST_BUILD
+ # COMMAND install_name_tool
+ # "-delete_rpath"
+ # "@executable_path/../lib"
+ # "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
+ # )
+ # endif()
endif() endif()
endif() endif()

1
pkgs/top-level/all-packages.nix
View File

@ -6807,6 +6807,7 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd { ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
llvmPackages = llvmPackages_39;
python = python2; python = python2;
}; };