git.iko.soy/typeable/nixpkgs
on master help sign in
llvm: fix llvm-config on darwin

With 7.1 llvm-config looks for libLLVM-7.1.dylib, but the shortVersion was still 7 so only 7 and 7.1.0 where aliased before. $ llvm-config --link-shared llvm-config: error: libLLVM-7.1.dylib is missing

commit807ba5f123bda28080eaefba46dc2b0af71a26fa authorDaiderd Jordan <daiderd@gmail.com> dateSat 4 May 2019, 13:16 (8 years ago) parent0f10b72
1 file changed+7−5
pkgs/development/compilers/llvm/7/llvm.nix+7−5
pkgs/development/compilers/llvm/7/llvm.nix+7−5
@@ -25,9 +25,10 @@ let
2525 src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
2626 polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h";
2727
28− # Used when creating a version-suffixed symlink of libLLVM.dylib
29− shortVersion = with stdenv.lib;
30− concatStringsSep "." (take 1 (splitString "." release_version));
28+ # Used when creating a versioned symlinks of libLLVM.dylib
29+ versionSuffixes = with stdenv.lib;
30+ let parts = splitString "." release_version; in
31+ imap (i: _: concatStringsSep "." (take i parts)) parts;
3132
3233in stdenv.mkDerivation (rec {
3334 name = "llvm-${version}";
@@ -142,8 +143,9 @@ in stdenv.mkDerivation (rec {
142143 + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
143144 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
144145 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
145− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
146− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
146+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
147+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
148+ '') versionSuffixes}
147149 '';
148150
149151 doCheck = stdenv.isLinux && (!stdenv.isx86_32);