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

Revert "Fix libcxxStdenv on Linux"

Browse Source 
This reverts commit 172ed10426df966ee5df76a1ef18f683698fe23f.
This commit is contained in:
Jude Taylor 2015-06-29 13:55:12 -07:00
parent 291d203f80
commit b62baacbc1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,2 +1,4 @@
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"

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

@ -1,2 +1,4 @@
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"

2
pkgs/top-level/all-packages.nix
View File

@ -3597,7 +3597,7 @@ let
libc = glibc; libc = glibc;
binutils = binutils; binutils = binutils;
inherit coreutils zlib; inherit coreutils zlib;
extraPackages = [ libcxx libcxxabi ]; extraPackages = [ libcxx ];
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
}; };