cross stdenv adaptor: Remove ccCross binutils attrs and binutils extra buildDepends

It now has the correct wrapped tools and nothing else is needed.
This commit is contained in:
John Ericson 2017-04-26 00:06:11 -04:00 committed by John Ericson
parent 121e7d9335
commit 9bfd03eff7
4 changed files with 15 additions and 20 deletions

View file

@ -56,12 +56,17 @@ rec {
# Return a modified stdenv that adds a cross compiler to the
# builds.
makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // {
makeStdenvCross = stdenvOrig: cross: cc: let
stdenv = stdenvOrig.override {
inherit cc;
# Overrides are surely not valid as packages built with this run on a
# different platform.
overrides = _: _: {};
allowedRequisites = null;
# Overrides are surely not valid as packages built with this run on a
# different platform.
overrides = _: _: {};
};
in stdenv // {
mkDerivation =
{ name ? "", buildInputs ? [], nativeBuildInputs ? []
, propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
@ -91,7 +96,6 @@ rec {
name = name + "-" + cross.config;
nativeBuildInputs = nativeBuildInputs
++ nativeInputsFromBuildInputs
++ [ gccCross binutils ]
++ stdenv.lib.optional selfNativeBuildInput nativeDrv
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs
@ -109,10 +113,6 @@ rec {
crossConfig = cross.config;
} // args.crossAttrs or {});
inherit gccCross binutils;
ccCross = gccCross;
};

View file

@ -31,15 +31,12 @@ in bootStages ++ [
targetPlatform = crossSystem;
inherit config overlays;
selfBuild = false;
stdenv = if crossSystem.useiOSCross or false
then let
inherit (buildPackages.darwin.ios-cross) cc binutils;
in buildPackages.makeStdenvCross
buildPackages.stdenv crossSystem
binutils cc
else buildPackages.makeStdenvCross
buildPackages.stdenv crossSystem
buildPackages.binutils buildPackages.gccCrossStageFinal;
stdenv = buildPackages.makeStdenvCross
buildPackages.stdenv
crossSystem
(if crossSystem.useiOSCross or false
then buildPackages.darwin.ios-cross
else buildPackages.gccCrossStageFinal);
})
]

View file

@ -81,7 +81,6 @@ rec {
nativeBuildInputs = [
pkgs.buildPackages.nukeReferences
pkgs.buildPackages.cpio
pkgs.buildPackages.binutils
];
buildCommand = ''

View file

@ -7805,7 +7805,6 @@ with pkgs;
stdenv = buildPackages.makeStdenvCross
buildPackages.buildPackages.stdenv
buildPackages.targetPlatform
buildPackages.binutils
buildPackages.gccCrossStageStatic;
};