mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Adding the expressions for gcc 4.5 for cross building.
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:
parent
52884c145f
commit
fa6c22b5c6
2 changed files with 17 additions and 3 deletions
|
@ -81,7 +81,7 @@ let version = "4.5.0";
|
|||
" --disable-libmudflap " +
|
||||
" --disable-libgomp " +
|
||||
" --disable-shared" +
|
||||
" --disable-decimal-float" # libdecnumber requires libc
|
||||
" --disable-decimal-float" + # libdecnumber requires libc
|
||||
" --disable-multilib"
|
||||
else
|
||||
" --with-headers=${libcCross}/include" +
|
||||
|
|
|
@ -2043,9 +2043,23 @@ let
|
|||
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 {
|
||||
gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } (
|
||||
gcc44_realCross.override {
|
||||
gcc_realCross.override {
|
||||
crossStageStatic = true;
|
||||
langCC = false;
|
||||
libcCross = null;
|
||||
|
@ -2057,7 +2071,7 @@ let
|
|||
};
|
||||
|
||||
gccCrossStageFinal = wrapGCCCross {
|
||||
gcc = forceBuildDrv gcc44_realCross;
|
||||
gcc = forceBuildDrv gcc_realCross;
|
||||
libc = libcCross;
|
||||
binutils = binutilsCross;
|
||||
cross = assert crossSystem != null; crossSystem;
|
||||
|
|
Loading…
Reference in a new issue