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

crossLibcStdenv: Just use overrideCC

Browse Source 
Now that we don't hackily override `mkDerivation`, the TODO is solved
and we just can!
This commit is contained in:
John Ericson 2018-07-24 16:39:13 -04:00
parent c12b50b267
commit 839f96a4c5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6334,13 +6334,7 @@ with pkgs;
{ substitutions = { gcc = gcc-unwrapped; }; } { substitutions = { gcc = gcc-unwrapped; }; }
../development/compilers/gcc/libstdc++-hook.sh; ../development/compilers/gcc/libstdc++-hook.sh;
# Can't just overrideCC, because then the stdenv-cross mkDerivation will be crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
# thrown away. TODO: find a better solution for this.
crossLibcStdenv = buildPackages.makeStdenvCross {
inherit (buildPackages.buildPackages) stdenv;
inherit buildPlatform hostPlatform targetPlatform;
cc = buildPackages.gccCrossStageStatic;
};
# The GCC used to build libc for the target platform. Normal gccs will be # The GCC used to build libc for the target platform. Normal gccs will be
# built with, and use, that cross-compiled libc. # built with, and use, that cross-compiled libc.