diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-28 15:20:14 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-28 17:54:11 +0100 |
commit | c388380bb48411dae999440f378daa75129eaabc (patch) | |
tree | ee7f546793ae99415fb284333746a3a97b5334d0 /pkgs/stdenv/linux | |
parent | eaed5598592ca8ccc05d9f09abcb4a27a06f1fb4 (diff) | |
download | nixlib-c388380bb48411dae999440f378daa75129eaabc.tar nixlib-c388380bb48411dae999440f378daa75129eaabc.tar.gz nixlib-c388380bb48411dae999440f378daa75129eaabc.tar.bz2 nixlib-c388380bb48411dae999440f378daa75129eaabc.tar.lz nixlib-c388380bb48411dae999440f378daa75129eaabc.tar.xz nixlib-c388380bb48411dae999440f378daa75129eaabc.tar.zst nixlib-c388380bb48411dae999440f378daa75129eaabc.zip |
Switch to GCC 5
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 965188a0cdd8..6012264d3a68 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -214,14 +214,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_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gccPlain = pkgs.gcc.cc.override { - isl = isl_0_11; - cloog = cloog_0_18_0; + isl = isl_0_14; }; }; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; |