diff options
| author | Léo Gaspard <leo@gaspard.io> | 2018-11-28 09:55:05 +0900 |
|---|---|---|
| committer | Léo Gaspard <leo@gaspard.io> | 2018-11-28 09:55:05 +0900 |
| commit | 8ecd555dedf09b3d3b6cdba66e92b833394860d4 (patch) | |
| tree | 37a2f3d5dfae832e316fab88cd73b55453cd0868 /pkgs/stdenv | |
| parent | 42213e49628a971510f4f585a2029a9bd296679a (diff) | |
| parent | beb063a1031c08df77996d97e4f6f9a2da1d911a (diff) | |
| download | nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar.gz nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar.bz2 nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar.lz nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar.xz nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.tar.zst nixlib-8ecd555dedf09b3d3b6cdba66e92b833394860d4.zip | |
Merge branch 'pr-46056' into staging
* pr-46056: binutils: use shared libs binutils: fix #44936 the huge size regression
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 978beea692c6..cfba5e7b88af 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -188,7 +188,9 @@ in # Rebuild binutils to use from stage2 onwards. overrides = self: super: { - binutils = super.binutils_nogold; + binutils-unwrapped = super.binutils-unwrapped.override { + gold = false; + }; inherit (prevStage) ccWrapperStdenv gcc-unwrapped coreutils gnugrep; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index f4184b92bd5f..8d513625df21 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -150,6 +150,7 @@ in with pkgs; rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.bintools.out}/bin/$i $out/bin done + cp '${lib.getLib binutils.bintools}'/lib/* "$out/lib/" chmod -R u+w $out |