diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-26 00:06:11 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:52:28 -0400 |
commit | 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764 (patch) | |
tree | 8856697b8729d2080d529c9d92a0d3e9db9670d6 /pkgs/stdenv | |
parent | 121e7d9335187fa742abba7994e03b495b8f2a6c (diff) | |
download | nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar.gz nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar.bz2 nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar.lz nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar.xz nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.tar.zst nixlib-9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764.zip |
cross stdenv adaptor: Remove `ccCross` `binutils` attrs and binutils extra buildDepends
It now has the correct wrapped tools and nothing else is needed.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 18 | ||||
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 15 | ||||
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 |
3 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7eab7ddb072c..fc332dff3aa3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -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; - }; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 7fe567251708..f9c23078cd30 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -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); }) ] diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 0378891b27ab..90c9d2cef67f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -81,7 +81,6 @@ rec { nativeBuildInputs = [ pkgs.buildPackages.nukeReferences pkgs.buildPackages.cpio - pkgs.buildPackages.binutils ]; buildCommand = '' |