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

Fix libcxxStdenv on Linux

Browse Source 
This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
This commit is contained in:
Benjamin Saunders 2015-06-28 20:58:31 +02:00
parent e1af50c4c4
commit 172ed10426
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

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