public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use gcc 4.9 by default

Browse Source
This commit is contained in:
Eelco Dolstra 2015-05-12 17:28:06 +02:00
parent fef86de618
commit 5a9ac9fed7
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/pipelight/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs { stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
, gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
}: }:
let let
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
}; };
buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ];
propagatedbuildInputs = [ curl cabextract ]; propagatedbuildInputs = [ curl cabextract ];
patches = [ ./pipelight.patch ]; patches = [ ./pipelight.patch ];

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

@ -239,7 +239,7 @@ let
# just the plain stdenv. # just the plain stdenv.
stdenv_32bit = lowPrio ( stdenv_32bit = lowPrio (
if system == "x86_64-linux" then if system == "x86_64-linux" then
overrideCC stdenv gcc48_multi overrideCC stdenv gcc_multi
else else
stdenv); stdenv);
@ -3469,8 +3469,20 @@ let
gambit = callPackage ../development/compilers/gambit { }; gambit = callPackage ../development/compilers/gambit { };
gcc = gcc48; gcc = gcc49;
gcc_multi = gcc48_multi;
gcc_multi =
if system == "x86_64-linux" then lowPrio (
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc.cc.override {
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
profiledCompiler = false;
enableMultilib = true;
}))
else throw "Multilib gcc not supported on ‘${system}’";
gcc_debug = lowPrio (wrapCC (gcc.cc.override {
stripped = false;
}));
gccApple = throw "gccApple is no longer supported"; gccApple = throw "gccApple is no longer supported";
@ -3601,24 +3613,6 @@ let
else null; else null;
})); }));
gcc48_multi =
if system == "x86_64-linux" then lowPrio (
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override {
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
profiledCompiler = false;
enableMultilib = true;
}))
else throw "Multilib gcc not supported on ‘${system}’";
gcc48_debug = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
stripped = false;
inherit noSysDirs;
cross = null;
libcCross = null;
binutilsCross = null;
}));
gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
inherit noSysDirs; inherit noSysDirs;