about summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-01-10 13:07:21 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-01-10 13:07:21 +0100
commit287144e34258f353425ba78817439df1f2c9e80d (patch)
treeec96c46c08855adc24b3664395b20974bd6923ea /pkgs/development/compilers/llvm
parent528664e3bb33bae66d4ce41877fe573395010dd9 (diff)
parente0fd84cf439f39d31e2c317b228b0c035cc6211d (diff)
downloadnixlib-287144e34258f353425ba78817439df1f2c9e80d.tar
nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.gz
nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.bz2
nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.lz
nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.xz
nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.zst
nixlib-287144e34258f353425ba78817439df1f2c9e80d.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r--pkgs/development/compilers/llvm/3.8/llvm.nix2
-rw-r--r--pkgs/development/compilers/llvm/3.9/llvm.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index fcb4214a1de8..ca6723172d7a 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
 
     substituteInPlace CMakeLists.txt \
-      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+      --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
       --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
   ''
   + ''
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 00c56e49e374..678ec759425d 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
 
     substituteInPlace CMakeLists.txt \
-      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+      --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$lib/lib")" \
       --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
   ''
   # Patch llvm-config to return correct library path based on --link-{shared,static}.