mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
llvmPackages_{14,15,16,17,git}.lldb: unify lua and python path patch
This commit is contained in:
parent
93fdb2d0da
commit
622a03c198
10 changed files with 5 additions and 97 deletions
|
@ -158,7 +158,7 @@ in let
|
||||||
[
|
[
|
||||||
./lldb/procfs.patch
|
./lldb/procfs.patch
|
||||||
resourceDirPatch
|
resourceDirPatch
|
||||||
./lldb/gnu-install-dirs.patch
|
../common/lldb/gnu-install-dirs.patch
|
||||||
]
|
]
|
||||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||||
# updated.
|
# updated.
|
||||||
|
|
|
@ -157,7 +157,7 @@ in let
|
||||||
[
|
[
|
||||||
./lldb/procfs.patch
|
./lldb/procfs.patch
|
||||||
resourceDirPatch
|
resourceDirPatch
|
||||||
./lldb/gnu-install-dirs.patch
|
../common/lldb/gnu-install-dirs.patch
|
||||||
]
|
]
|
||||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||||
# updated.
|
# updated.
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
||||||
index 3291a7c808e1..b27d27ce6a87 100644
|
|
||||||
--- a/cmake/modules/AddLLDB.cmake
|
|
||||||
+++ b/cmake/modules/AddLLDB.cmake
|
|
||||||
@@ -109,7 +109,7 @@ function(add_lldb_library name)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PARAM_SHARED)
|
|
||||||
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
||||||
if(PARAM_INSTALL_PREFIX)
|
|
||||||
set(install_dest ${PARAM_INSTALL_PREFIX})
|
|
||||||
endif()
|
|
||||||
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
|
||||||
index 7d48491ec89a..c04543585588 100644
|
|
||||||
--- a/tools/intel-features/CMakeLists.txt
|
|
||||||
+++ b/tools/intel-features/CMakeLists.txt
|
|
||||||
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS lldbIntelFeatures
|
|
||||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
|
@ -162,7 +162,7 @@ in let
|
||||||
[
|
[
|
||||||
# FIXME: do we need this? ./procfs.patch
|
# FIXME: do we need this? ./procfs.patch
|
||||||
resourceDirPatch
|
resourceDirPatch
|
||||||
./lldb/gnu-install-dirs.patch
|
../common/lldb/gnu-install-dirs.patch
|
||||||
]
|
]
|
||||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||||
# updated.
|
# updated.
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
||||||
index 3291a7c808e1..b27d27ce6a87 100644
|
|
||||||
--- a/cmake/modules/AddLLDB.cmake
|
|
||||||
+++ b/cmake/modules/AddLLDB.cmake
|
|
||||||
@@ -109,7 +109,7 @@ function(add_lldb_library name)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PARAM_SHARED)
|
|
||||||
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
||||||
if(PARAM_INSTALL_PREFIX)
|
|
||||||
set(install_dest ${PARAM_INSTALL_PREFIX})
|
|
||||||
endif()
|
|
||||||
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
|
||||||
index 7d48491ec89a..c04543585588 100644
|
|
||||||
--- a/tools/intel-features/CMakeLists.txt
|
|
||||||
+++ b/tools/intel-features/CMakeLists.txt
|
|
||||||
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS lldbIntelFeatures
|
|
||||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
|
@ -153,7 +153,7 @@ in let
|
||||||
patches =
|
patches =
|
||||||
[
|
[
|
||||||
# FIXME: do we need this? ./procfs.patch
|
# FIXME: do we need this? ./procfs.patch
|
||||||
./lldb/gnu-install-dirs.patch
|
../common/lldb/gnu-install-dirs.patch
|
||||||
]
|
]
|
||||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||||
# updated.
|
# updated.
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
||||||
index 3291a7c808e1..b27d27ce6a87 100644
|
|
||||||
--- a/cmake/modules/AddLLDB.cmake
|
|
||||||
+++ b/cmake/modules/AddLLDB.cmake
|
|
||||||
@@ -109,7 +109,7 @@ function(add_lldb_library name)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PARAM_SHARED)
|
|
||||||
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
||||||
if(PARAM_INSTALL_PREFIX)
|
|
||||||
set(install_dest ${PARAM_INSTALL_PREFIX})
|
|
||||||
endif()
|
|
||||||
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
|
||||||
index 7d48491ec89a..c04543585588 100644
|
|
||||||
--- a/tools/intel-features/CMakeLists.txt
|
|
||||||
+++ b/tools/intel-features/CMakeLists.txt
|
|
||||||
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS lldbIntelFeatures
|
|
||||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
|
@ -158,7 +158,7 @@ in let
|
||||||
patches =
|
patches =
|
||||||
[
|
[
|
||||||
# FIXME: do we need this? ./procfs.patch
|
# FIXME: do we need this? ./procfs.patch
|
||||||
./lldb/gnu-install-dirs.patch
|
../common/lldb/gnu-install-dirs.patch
|
||||||
]
|
]
|
||||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||||
# updated.
|
# updated.
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
||||||
index 3291a7c808e1..b27d27ce6a87 100644
|
|
||||||
--- a/cmake/modules/AddLLDB.cmake
|
|
||||||
+++ b/cmake/modules/AddLLDB.cmake
|
|
||||||
@@ -109,7 +109,7 @@ function(add_lldb_library name)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PARAM_SHARED)
|
|
||||||
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
||||||
if(PARAM_INSTALL_PREFIX)
|
|
||||||
set(install_dest ${PARAM_INSTALL_PREFIX})
|
|
||||||
endif()
|
|
||||||
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
|
||||||
index 7d48491ec89a..c04543585588 100644
|
|
||||||
--- a/tools/intel-features/CMakeLists.txt
|
|
||||||
+++ b/tools/intel-features/CMakeLists.txt
|
|
||||||
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS lldbIntelFeatures
|
|
||||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
Loading…
Add table
Add a link
Reference in a new issue