public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26024 from Mic92/llvm-config-3.4

Browse Source 
llvmPackages_34.llvm: fix output of llvm-config
This commit is contained in:
Jörg Thalheim 2017-05-24 00:04:13 +01:00 committed by GitHub
commit 4fecdceec2
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch Normal file
View 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

10
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

@ -29,12 +29,16 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ perl groff cmake libxml2 libffi ] [ perl groff cmake libxml2 libffi python2 ] /*
++ stdenv.lib.optional (!stdenv.isDarwin) python2 /*
++ stdenv.lib.optional stdenv.isLinux valgrind */; ++ stdenv.lib.optional stdenv.isLinux valgrind */;
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
# llvm-config --libfiles returns (non-existing) static libs
./fix-llvm-config.patch
];
# hacky fix: created binaries need to be run before installation # hacky fix: created binaries need to be run before installation
preBuild = '' preBuild = ''
mkdir -p $out/ mkdir -p $out/
@ -48,7 +52,7 @@ in stdenv.mkDerivation rec {
"-DLLVM_REQUIRES_RTTI=1" "-DLLVM_REQUIRES_RTTI=1"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";
postBuild = '' postBuild = ''
rm -fR $out rm -fR $out