diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch index b2e79086beda..08b6fae654e5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -79,3 +79,42 @@ index b5316540fdf3..3c3c882d503f 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4..d56fc6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON) + --cfgBldDir=${lldb_scripts_dir} + --prefix=${CMAKE_BINARY_DIR} + --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR} +- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX} ++ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ${use_python_wrapper_from_src_dir} + ${use_six_py_from_system} + VERBATIM +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index a9059dd..d76a47d 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -124,7 +124,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + link_directories("${LLVM_LIBRARY_DIR}") + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + + set(LLDB_BUILT_STANDALONE 1) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 3598247..bd60451 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK) + endif() + + set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir}) +- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX}) ++ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + + # Install the LLDB python module + install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR}) |