diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 22:11:38 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 22:11:38 -0600 |
| commit | 09ff7707ae0b275f18e151cc8bd70448bafa6f46 (patch) | |
| tree | 838d02905151d4750c5ada6b27ac9c5b8ae7ba85 /pkgs/development/compilers/llvm | |
| parent | 8e05911ccb73c28b3040cd0a1ef240e655a1e83c (diff) | |
| download | nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar.gz nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar.bz2 nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar.lz nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar.xz nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.tar.zst nixpkgs-09ff7707ae0b275f18e151cc8bd70448bafa6f46.zip | |
llvm3.{8,9}: use old CMAKE_INSTALL_NAME_DIR value
adcf4aa5241f8dc37195d9bcbce27a80b913a512 broke these two. The old way seems to work and might still avoid the original lldb issues.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 2 |
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 fcb4214a1de..ca6723172d7 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 00c56e49e37..678ec759425 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}. |