diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-07 01:44:49 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-07 01:44:49 -0700 |
| commit | 074c4a7f789449f6212b6e5c5ead26969809e534 (patch) | |
| tree | f2deafc4e0ba5a95216fe1a09bb8cf2b87fbb25b /pkgs/stdenv | |
| parent | d3f3317632f40b403afab3cc055c78ead00e93bd (diff) | |
| parent | 10bb715c077ced71defbd4318cebe77b64b7a279 (diff) | |
| download | nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar.gz nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar.bz2 nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar.lz nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar.xz nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.tar.zst nixlib-074c4a7f789449f6212b6e5c5ead26969809e534.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 81231fdf97a1..480801d0d01a 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -232,7 +232,7 @@ rec { /* Modify a stdenv so that it uses the Gold linker. */ useGoldLinker = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_COMPILE or "") + " -fuse-ld=gold"; + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold"; }); }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index f9943fc5f199..6bd67d8c7a01 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -11,7 +11,7 @@ rec { }); busyboxMinimal = busybox.override { - useUclibc = true; + useMusl = true; enableStatic = true; enableMinimal = true; extraConfig = '' |