Use GCC 7 by default

This commit is contained in:
Eelco Dolstra 2017-07-25 13:56:57 +02:00
parent ecaef62bd9
commit ca8aa5dc87
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 3 additions and 3 deletions

View File

@ -214,9 +214,9 @@ in
gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; };
mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; };
libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; };
isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; };
isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; };
gcc-unwrapped = super.gcc-unwrapped.override {
isl = isl_0_14;
isl = isl_0_17;
};
};
extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++

View File

@ -5227,7 +5227,7 @@ with pkgs;
gambit = callPackage ../development/compilers/gambit { };
gerbil = callPackage ../development/compilers/gerbil { };
gcc = gcc6;
gcc = gcc7;
gcc-unwrapped = gcc.cc;
wrapCCMulti = cc: