summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-12-31 13:56:07 -0600
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-11-03 14:52:44 +0100
commit78d3cb1d16b3b1df8862018784a2f5da50f218e5 (patch)
tree90a36e0227bb9ba3cca517acb82c8d4a100d9650 /pkgs/stdenv
parent5b46a7c240fe9e22a673d7dbd107498e042b437b (diff)
downloadnixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar.gz
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar.bz2
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar.lz
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar.xz
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.tar.zst
nixpkgs-78d3cb1d16b3b1df8862018784a2f5da50f218e5.zip
binutils: offer "for bootstrap" variant that's less.. feature-complete
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 86503b96245..697082c01bc 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -34,6 +34,13 @@ in with pkgs; rec {
   };
 
   bootGCC = gcc.cc.override { enableLTO = false; };
+  bootBinutils = binutils.bintools.override {
+    withAllTargets = false;
+    # Don't need two linkers, disable whatever's not primary/default.
+    gold = false;
+    # bootstrap is easier w/static
+    enableShared = false;
+  };
 
   build =
 
@@ -150,7 +157,7 @@ in with pkgs; rec {
 
         # Copy binutils.
         for i in as ld ar ranlib nm strip readelf objdump; do
-          cp ${binutils.bintools.out}/bin/$i $out/bin
+          cp ${bootBinutils.out}/bin/$i $out/bin
         done
         cp '${lib.getLib binutils.bintools}'/lib/* "$out/lib/"