diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/7')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index e9853c58ca57..84ca6af3b36d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" +export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" |