gcc: switch default to gcc9

This commit is contained in:
Robin Gloster
2019-11-02 10:40:32 +01:00
committed by Franz Pletz
parent 83a5ad13b7
commit 8f729c0070
+3 -6
View File
@@ -3125,9 +3125,7 @@ in
fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
fcppt = callPackage ../development/libraries/fcppt { fcppt = callPackage ../development/libraries/fcppt { };
stdenv = gcc8Stdenv;
};
fcrackzip = callPackage ../tools/security/fcrackzip { }; fcrackzip = callPackage ../tools/security/fcrackzip { };
@@ -3158,7 +3156,6 @@ in
flatpak-builder = callPackage ../development/tools/flatpak-builder { }; flatpak-builder = callPackage ../development/tools/flatpak-builder { };
fltrdr = callPackage ../tools/misc/fltrdr { fltrdr = callPackage ../tools/misc/fltrdr {
stdenv = gcc8Stdenv;
icu = icu63; icu = icu63;
}; };
@@ -7663,8 +7660,8 @@ in
gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
gccFun = callPackage ../development/compilers/gcc/8; gccFun = callPackage ../development/compilers/gcc/9;
gcc = gcc8; gcc = gcc9;
gcc-unwrapped = gcc.cc; gcc-unwrapped = gcc.cc;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {