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

Trying to remove more hydra evaluation errors related to gcc.

Browse Source 
svn path=/nixpkgs/trunk/; revision=20687
This commit is contained in:
Lluís Batlle i Rossell 2010-03-17 10:17:32 +00:00
parent 6934d0770c
commit 4824ecbb62
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -221,7 +221,9 @@ stdenv.mkDerivation ({
]; ];
# Volunteers needed for the {Cyg,Dar}win ports of *PPL. # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
platforms = stdenv.lib.platforms.linux ++ [ "i686-darwin" ]; # gnatboot is not available out of linux platforms, so we disable the darwin build
# for the gnat (ada compiler).
platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
}; };
} }
// (if langVhdl then rec { // (if langVhdl then rec {

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

@ -1974,8 +1974,8 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gcc44_realCross = lib.addMetaAttrs { platforms = []; } ( gcc44_realCross = lib.addMetaAttrs { platforms = []; }
makeOverridable (import ../development/compilers/gcc-4.4) { (makeOverridable (import ../development/compilers/gcc-4.4) {
inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs
gettext which; gettext which;
binutilsCross = binutilsCross; binutilsCross = binutilsCross;
@ -1990,12 +1990,13 @@ let
}); });
gccCrossStageStatic = wrapGCCCross { gccCrossStageStatic = wrapGCCCross {
gcc = forceBuildDrv (gcc44_realCross.override { gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } (
gcc44_realCross.override {
crossStageStatic = true; crossStageStatic = true;
langCC = false; langCC = false;
libcCross = null; libcCross = null;
enableShared = true; enableShared = true;
}); }));
libc = null; libc = null;
binutils = binutilsCross; binutils = binutilsCross;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;