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

It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools

This commit is contained in:
Dan Peebles 2015-02-17 22:39:31 -05:00
parent a78d164b1e
commit 3a423e4405
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.5/libc++/default.nix
View File

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
inherit libcxxabi;
setupHook = ./setup-hook.sh;
meta = {

6
pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
View File

@ -1,2 +1,4 @@
export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1 -stdlib=libc++"
export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,@libcxxabi@/lib"
export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"