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

Merge pull request #53539 from matthewbauer/darwin-fixes4

Browse Source 
Fixes for recent darwin changes
This commit is contained in:
Matthew Bauer
2019-01-07 15:44:21 -06:00
committed by GitHub
parent cecec1f744 ed6148726b
commit 3cfdf8eb23
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@@ -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")' ""
''
+ ''

2
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@@ -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}.