stdenv-linux: Avoid building m4/bison twice

+3 -3
+3 -3
pkgs/stdenv/linux/default.nix
··· 190 name = "bootstrap-gcc-wrapper"; 191 192 overrides = pkgs: { 193 - inherit (stage1.pkgs) perl binutils paxctl; 194 # This also contains the full, dynamically linked, final Glibc. 195 }; 196 }; ··· 207 name = "bootstrap-gcc-wrapper"; 208 209 overrides = pkgs: rec { 210 - inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders; 211 # Link GCC statically against GMP etc. This makes sense because 212 # these builds of the libraries are only used by GCC, so it 213 # reduces the size of the stdenv closure. ··· 241 # because gcc (since JAR support) already depends on zlib, and 242 # then if we already have a zlib we want to use that for the 243 # other purposes (binutils and top-level pkgs) too. 244 - inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders; 245 246 gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { 247 nativeTools = false;
··· 190 name = "bootstrap-gcc-wrapper"; 191 192 overrides = pkgs: { 193 + inherit (stage1.pkgs) perl binutils paxctl gnum4 bison; 194 # This also contains the full, dynamically linked, final Glibc. 195 }; 196 }; ··· 207 name = "bootstrap-gcc-wrapper"; 208 209 overrides = pkgs: rec { 210 + inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders gnum4 bison; 211 # Link GCC statically against GMP etc. This makes sense because 212 # these builds of the libraries are only used by GCC, so it 213 # reduces the size of the stdenv closure. ··· 241 # because gcc (since JAR support) already depends on zlib, and 242 # then if we already have a zlib we want to use that for the 243 # other purposes (binutils and top-level pkgs) too. 244 + inherit (stage3.pkgs) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; 245 246 gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { 247 nativeTools = false;