diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-05-23 17:10:19 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-05-23 18:38:44 +0100 |
| commit | 4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7 (patch) | |
| tree | 93b84e70dc1a174a9b71086750fc47782470ba6c /pkgs/development/compilers | |
| parent | 8a423c3a90a4fdc92e6b44ec46c135d4ab13730e (diff) | |
| download | nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar.gz nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar.bz2 nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar.lz nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar.xz nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.tar.zst nixlib-4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7.zip | |
llvmPackages_34.llvm: fix output of llvm-config
now llvm-config --libnames and llvm-config --libfiles output the proper files.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/llvm.nix | 10 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch new file mode 100644 index 000000000000..772c49609275 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch @@ -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 diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 0a18f7e01cf6..73469fa122a9 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -29,12 +29,16 @@ in stdenv.mkDerivation rec { ''; buildInputs = - [ perl groff cmake libxml2 libffi ] - ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /* + [ perl groff cmake libxml2 libffi python2 ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */; 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 preBuild = '' mkdir -p $out/ @@ -48,7 +52,7 @@ in stdenv.mkDerivation rec { "-DLLVM_REQUIRES_RTTI=1" "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; + ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; postBuild = '' rm -fR $out |