diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-11 19:28:13 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 21:31:50 -0400 |
| commit | 85b4d30c0b464f6431eac6c50687111cfc69eb22 (patch) | |
| tree | efcdb3fedb791a7ce761ebd1eb0d0005ea55c7b1 /pkgs/stdenv/linux | |
| parent | 23cc0c4420d3b2d5fb023f2368ba7d11412c1fba (diff) | |
| download | nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar.gz nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar.bz2 nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar.lz nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar.xz nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.tar.zst nixlib-85b4d30c0b464f6431eac6c50687111cfc69eb22.zip | |
binutils: Respect the targetPlatform
Use `buildPackages.binutils` to get build = host != target binutils, i.e. the old `binutilsCross`, and use `buildPackages.buildPackages.binutils` to get build = host = target binutils, i.e. the old `binutils`. `buildPackages` chains like this are supposed to remove the need for all such `*Cross` derivations. We start with binutils because it's comparatively easy. No hashes of cross-tests should be changed
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 8b166fb5b49f..47c61aaad818 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -70,8 +70,6 @@ let pkgs = pkgsFun ({inherit system;} // selectedCrossSystem); - inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross; - glibc = pkgs.buildPackages.libcCross; bash = pkgs.bash; findutils = pkgs.findutils; @@ -126,11 +124,15 @@ rec { build = - stdenv.mkDerivation { + pkgs.buildPackages.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; crossConfig = pkgs.hostPlatform.config; - buildInputs = [nukeReferences cpio binutilsCross]; + buildInputs = [ + pkgs.buildPackages.nukeReferences + pkgs.buildPackages.cpio + pkgs.buildPackages.binutils + ]; buildCommand = '' set -x @@ -261,7 +263,7 @@ rec { allowedReferences = []; }; - dist = stdenv.mkDerivation { + dist = pkgs.buildPackages.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; buildCommand = '' |