binutilsCross: Remove and use binutils instead always

See previous commit for what was done to `binutils` to make this
possible.

There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:

  "Move along, nothing to see here!"

No hashes should be changed with this commit
This commit is contained in:
John Ericson
2017-04-25 21:36:19 -04:00
parent 85b4d30c0b
commit 295315cc87
13 changed files with 40 additions and 53 deletions
+3 -3
View File
@@ -56,7 +56,7 @@ rec {
# Return a modified stdenv that adds a cross compiler to the
# builds.
makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // {
makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // {
# Overrides are surely not valid as packages built with this run on a
# different platform.
@@ -91,7 +91,7 @@ rec {
name = name + "-" + cross.config;
nativeBuildInputs = nativeBuildInputs
++ nativeInputsFromBuildInputs
++ [ gccCross binutilsCross ]
++ [ gccCross binutils ]
++ stdenv.lib.optional selfNativeBuildInput nativeDrv
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs
@@ -110,7 +110,7 @@ rec {
crossConfig = cross.config;
} // args.crossAttrs or {});
inherit gccCross binutilsCross;
inherit gccCross binutils;
ccCross = gccCross;
};
+1 -1
View File
@@ -39,7 +39,7 @@ in bootStages ++ [
binutils cc
else buildPackages.makeStdenvCross
buildPackages.stdenv crossSystem
buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
buildPackages.binutils buildPackages.gccCrossStageFinal;
})
]