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

Adding the expressions for gcc 4.5 for cross building.

Browse Source 
Although I still have set gcc 4.4 for that, I tested with the 4.5 expression
and it cross built perfectly bison for the sheevaplug.

svn path=/nixpkgs/trunk/; revision=21463
This commit is contained in:
Lluís Batlle i Rossell 2010-04-30 19:12:59 +00:00
parent 52884c145f
commit fa6c22b5c6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -81,7 +81,7 @@ let version = "4.5.0";
" --disable-libmudflap " + " --disable-libmudflap " +
" --disable-libgomp " + " --disable-libgomp " +
" --disable-shared" + " --disable-shared" +
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" + # libdecnumber requires libc
" --disable-multilib" " --disable-multilib"
else else
" --with-headers=${libcCross}/include" + " --with-headers=${libcCross}/include" +

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

@ -2043,9 +2043,23 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
gcc45_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc-4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
ppl cloogppl gettext which noSysDirs;
binutilsCross = binutilsCross;
libcCross = libcCross;
profiledCompiler = false;
enableMultilib = false;
crossStageStatic = false;
cross = assert crossSystem != null; crossSystem;
});
gcc_realCross = gcc44_realCross;
gccCrossStageStatic = wrapGCCCross { gccCrossStageStatic = wrapGCCCross {
gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } (
gcc44_realCross.override { gcc_realCross.override {
crossStageStatic = true; crossStageStatic = true;
langCC = false; langCC = false;
libcCross = null; libcCross = null;
@ -2057,7 +2071,7 @@ let
}; };
gccCrossStageFinal = wrapGCCCross { gccCrossStageFinal = wrapGCCCross {
gcc = forceBuildDrv gcc44_realCross; gcc = forceBuildDrv gcc_realCross;
libc = libcCross; libc = libcCross;
binutils = binutilsCross; binutils = binutilsCross;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;