llvmPackages_3.7: fix libnames output of llvm-config
see also 4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7
This commit is contained in:
parent
100cd2af5a
commit
7d12608069
13
pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
Normal file
13
pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
|
||||||
|
index eacefdf60bf..40d25f5cef8 100644
|
||||||
|
--- a/utils/llvm-build/llvmbuild/main.py
|
||||||
|
+++ b/utils/llvm-build/llvmbuild/main.py
|
||||||
|
@@ -412,7 +412,7 @@ subdirectories = %s
|
||||||
|
if library_name is None:
|
||||||
|
library_name_as_cstr = '0'
|
||||||
|
else:
|
||||||
|
- library_name_as_cstr = '"lib%s.a"' % library_name
|
||||||
|
+ library_name_as_cstr = '"lib%s.so"' % library_name
|
||||||
|
f.write(' { "%s", %s, %d, { %s } },\n' % (
|
||||||
|
name, library_name_as_cstr, is_installed,
|
||||||
|
', '.join('"%s"' % dep
|
@ -53,6 +53,11 @@ in stdenv.mkDerivation rec {
|
|||||||
ln -sv $PWD/lib $out
|
ln -sv $PWD/lib $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
|
||||||
|
# llvm-config --libfiles returns (non-existing) static libs
|
||||||
|
./fix-llvm-config.patch
|
||||||
|
];
|
||||||
|
|
||||||
cmakeFlags = with stdenv; [
|
cmakeFlags = with stdenv; [
|
||||||
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
||||||
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
|
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user