diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index a70de4f4e50..20cd848ded4 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -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" + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1b779eda5..bfbdf8b6599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;