Merge branch 'pr-46056' into staging

* pr-46056:
  binutils: use shared libs
  binutils: fix #44936 the huge size regression
This commit is contained in:
Léo Gaspard
2018-11-28 09:55:05 +09:00
3 changed files with 29 additions and 13 deletions
+3 -1
View File
@@ -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;
@@ -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