nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to GCC 5

Browse Source 
(cherry picked from commit c388380bb4)
This commit is contained in:
Eelco Dolstra
2016-02-28 15:20:14 +01:00
parent 15db5f4353
commit cb5f0fc64d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/stdenv/linux/default.nix
View File

@@ -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 ];

2
pkgs/top-level/all-packages.nix
View File

@@ -4065,7 +4065,7 @@ let
gambit = callPackage ../development/compilers/gambit { };
gcc = gcc49;
gcc = gcc5;
gcc_multi =
if system == "x86_64-linux" then lowPrio (