Switch to GCC 5
This commit is contained in:
parent
f6d3b7a2ae
commit
729870467a
@ -210,14 +210,9 @@ rec {
|
||||
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;
|
||||
};
|
||||
isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
|
||||
gccPlain = pkgs.gcc.cc.override {
|
||||
isl = isl_0_11;
|
||||
cloog = cloog_0_18_0;
|
||||
isl = isl;
|
||||
};
|
||||
};
|
||||
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
|
||||
|
@ -3920,7 +3920,7 @@ let
|
||||
|
||||
gambit = callPackage ../development/compilers/gambit { };
|
||||
|
||||
gcc = gcc49;
|
||||
gcc = gcc5;
|
||||
|
||||
gcc_multi =
|
||||
if system == "x86_64-linux" then lowPrio (
|
||||
@ -4068,7 +4068,7 @@ let
|
||||
cross = null;
|
||||
libcCross = if crossSystem != null then libcCross else null;
|
||||
|
||||
isl = isl_0_14;
|
||||
isl = isl_0_15;
|
||||
}));
|
||||
|
||||
gfortran = if !stdenv.isDarwin then gfortran49
|
||||
|
Loading…
Reference in New Issue
Block a user