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
2015-06-01 20:08:43 +02:00
parent 592d4af9cf 3aee39bb83
commit 553abf71ba
1274 changed files with 28934 additions and 14858 deletions
@@ -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;