diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 16:02:02 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 16:02:38 +0100 |
| commit | dd53c65dccb6f3e45262909cd2d4548014214f12 (patch) | |
| tree | 52a0937d1bbd6d0bb273b1b172085328aabab924 /pkgs/stdenv/linux | |
| parent | 2af1cb3aa673102491ffd8cfdeca8ae2dec154b5 (diff) | |
| parent | 4f5d48abf5c4e39da8636b18db1cc9bfebd14d68 (diff) | |
| download | nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.gz nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.bz2 nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.lz nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.xz nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.zst nixpkgs-dd53c65dccb6f3e45262909cd2d4548014214f12.zip | |
Merge remote-tracking branch 'origin/gcc-5' into staging
Still some breakage but no blockers: http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
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 e4abe724210..3e94391c426 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -211,14 +211,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 ]; |