libc++: Fix on Linux

On Linux (unlike Darwin), libc++ cannot automatically propagate
libc++abi. So we need to add libc++abi to the RPATH.
This commit is contained in:
Eelco Dolstra 2014-10-11 22:21:57 +02:00
parent a4619673b5
commit 3ac28c3645
2 changed files with 3 additions and 3 deletions

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.abi = libcxxabi;
inherit libcxxabi;
# Remove a Makefile that causes many retained dependencies.
postInstall = "rm $out/include/c++/v1/Makefile";

View file

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