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

libstdc++: add setup-hook

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-04 21:07:05 +02:00
parent f23b1a6f94
commit 0ea92a3c24
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/gcc/libstdc++-hook.sh Normal file
View File

@ -0,0 +1 @@
export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"

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

@ -5354,6 +5354,10 @@ with pkgs;
gccApple = throw "gccApple is no longer supported"; gccApple = throw "gccApple is no longer supported";
libstdcxxHook = makeSetupHook
{ substitutions = { gcc = gcc-unwrapped; }; }
../development/compilers/gcc/libstdc++-hook.sh;
# Can't just overrideCC, because then the stdenv-cross mkDerivation will be # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
# thrown away. TODO: find a better solution for this. # thrown away. TODO: find a better solution for this.
crossLibcStdenv = buildPackages.makeStdenvCross { crossLibcStdenv = buildPackages.makeStdenvCross {