mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues 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
parent 32d618b2ca 172ed10426
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=" -stdlib=libc++"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"

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=" -stdlib=libc++"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"

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

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