tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
lldb: fix 8&9
tcmal
4 years ago
674a24e5
cc7740ae
+27
2 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
llvm
8
lldb
gnu-install-dirs.patch
9
lldb
gnu-install-dirs.patch
+13
pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch
···
105
105
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
106
106
107
107
set(LLDB_BUILT_STANDALONE 1)
108
108
+
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
109
109
+
index 3598247..bd60451 100644
110
110
+
--- a/scripts/CMakeLists.txt
111
111
+
+++ b/scripts/CMakeLists.txt
112
112
+
@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK)
113
113
+
endif()
114
114
+
115
115
+
set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir})
116
116
+
- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
117
117
+
+ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
118
118
+
119
119
+
# Install the LLDB python module
120
120
+
install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR})
+14
pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch
···
89
89
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
90
90
91
91
set(LLDB_BUILT_STANDALONE 1)
92
92
+
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
93
93
+
index 7de7973..b70aecc 100644
94
94
+
--- a/scripts/CMakeLists.txt
95
95
+
+++ b/scripts/CMakeLists.txt
96
96
+
@@ -50,7 +50,8 @@ if(NOT LLDB_BUILD_FRAMEWORK)
97
97
+
OUTPUT_STRIP_TRAILING_WHITESPACE)
98
98
+
execute_process(
99
99
+
COMMAND ${PYTHON_EXECUTABLE}
100
100
+
- -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))"
101
101
+
+ -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))"
102
102
+
+ ${CMAKE_INSTALL_LIBDIR}/../
103
103
+
OUTPUT_VARIABLE SWIG_INSTALL_DIR
104
104
+
OUTPUT_STRIP_TRAILING_WHITESPACE)
105
105
+