Revert "Switch to GCC 5"

This reverts commit 729870467a97382e2252defe4ae3b04765b9451b.

Changed files
+9 -4
pkgs
stdenv
linux
top-level
+7 -2
pkgs/stdenv/linux/default.nix
···
gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-
isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
gccPlain = pkgs.gcc.cc.override {
-
isl = isl;
};
};
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
···
gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+
isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+
cloog_0_18_0 = pkgs.cloog_0_18_0.override {
+
stdenv = pkgs.makeStaticLibraries pkgs.stdenv;
+
isl = isl_0_11;
+
};
gccPlain = pkgs.gcc.cc.override {
+
isl = isl_0_11;
+
cloog = cloog_0_18_0;
};
};
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
+2 -2
pkgs/top-level/all-packages.nix
···
gambit = callPackage ../development/compilers/gambit { };
-
gcc = gcc5;
gcc_multi =
if system == "x86_64-linux" then lowPrio (
···
cross = null;
libcCross = if crossSystem != null then libcCross else null;
-
isl = isl_0_15;
}));
gfortran = if !stdenv.isDarwin then gfortran49
···
gambit = callPackage ../development/compilers/gambit { };
+
gcc = gcc49;
gcc_multi =
if system == "x86_64-linux" then lowPrio (
···
cross = null;
libcCross = if crossSystem != null then libcCross else null;
+
isl = isl_0_14;
}));
gfortran = if !stdenv.isDarwin then gfortran49