From f4a42ae509216463e774843ffabc75399532a717 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 18:01:50 -0700
Subject: [PATCH] gcc: Make 5.x the default
---
pkgs/stdenv/linux/default.nix | 9 ++-------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 12fc3fed5a5a..2436181aa7ad 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -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_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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0124db33895b..5a96d5c455c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3701,7 +3701,7 @@ let
gambit = callPackage ../development/compilers/gambit { };
- gcc = gcc49;
+ gcc = gcc5;
gcc_multi =
if system == "x86_64-linux" then lowPrio (