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

Merge branch 'clang-stdenv' of https://github.com/Ralith/nixpkgs into staging

Browse Source
This commit is contained in:
Shea Levy 2015-06-28 15:54:06 -04:00
commit 291d203f80
3 changed files with 5 additions and 9 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,4 +1,2 @@
export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" export NIX_CXXSTDLIB_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,4 +1,2 @@
export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" export NIX_CXXSTDLIB_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 ]; extraPackages = [ libcxx libcxxabi ];
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
}; };