diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
| commit | 553abf71ba454a724d072a650a9cb09e360b375a (patch) | |
| tree | 7f483e613f6ef62f9e3dbf51ba930e80f7cf813d /pkgs/stdenv/linux | |
| parent | 592d4af9cf0e81907919cf954c1d0ad3089ae772 (diff) | |
| parent | 3aee39bb83337b586d0be702eb5dababc5f7ef29 (diff) | |
| download | nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.gz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.bz2 nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.lz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.xz nixlib-553abf71ba454a724d072a650a9cb09e360b375a.tar.zst nixlib-553abf71ba454a724d072a650a9cb09e360b375a.zip | |
Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/development/libraries/wayland/default.nix pkgs/development/tools/build-managers/cmake/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e4d79fce7448..861b7930b71e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -91,6 +91,7 @@ rec { nativeTools = false; nativeLibc = false; cc = gccPlain; + isGNU = true; libc = glibc; inherit binutils coreutils; name = name; @@ -234,6 +235,7 @@ rec { gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; + isGNU = true; cc = stage4.stdenv.cc.cc; libc = stage4.pkgs.glibc; inherit (stage4.pkgs) binutils coreutils; |