Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
122 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 28 additions & 11 deletions
39
pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,33 @@ | ||
diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt | ||
index 00e4882..8f29797 100644 | ||
index 133c987a..33625271 100644 | ||
--- a/cpp/ycm/CMakeLists.txt | ||
+++ b/cpp/ycm/CMakeLists.txt | ||
@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG ) | ||
# our libraries require, in particular the Python one (from pyenv for | ||
# instance). | ||
set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) | ||
- # When loading our library, the dynamic linker will look for | ||
- # libclang.so.4, not libclang.so.4.x. | ||
- file( RENAME | ||
- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION} | ||
- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} ) | ||
endif() | ||
@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET ) | ||
POST_BUILD | ||
COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>" | ||
) | ||
- else() | ||
- add_custom_command( | ||
- TARGET ${PROJECT_NAME} | ||
- POST_BUILD | ||
- COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>" | ||
- ) | ||
- | ||
- if( NOT APPLE ) | ||
- # When loading our library, the dynamic linker may look for | ||
- # libclang.so.x instead of libclang.so.x.y. Create the corresponding | ||
- # symlink. | ||
- get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME ) | ||
- string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2" | ||
- LIBCLANG_SONAME ${LIBCLANG_NAME} ) | ||
- add_custom_command( | ||
- TARGET ${PROJECT_NAME} | ||
- POST_BUILD | ||
- COMMAND ${CMAKE_COMMAND} -E create_symlink | ||
- "${LIBCLANG_NAME}" | ||
- "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_SONAME}" | ||
- ) | ||
- endif() | ||
endif() | ||
endif() | ||
|
Oops, something went wrong.