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

Trying to remove evaluation errors in hydra nixpkgs for the cross compiler related

Browse Source 
derivations.
I remove their 'meta platforms' attribute, defined in the gcc expression, so hydra
does not attempt to build them in the nixpkgs evaluation.

svn path=/nixpkgs/trunk/; revision=20678
This commit is contained in:
Lluís Batlle i Rossell 2010-03-17 09:05:11 +00:00
parent 1163f22972
commit f0ce6cfe94
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1974,19 +1974,20 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) { gcc44_realCross = lib.addMetaAttrs { platforms = []; } (
inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs makeOverridable (import ../development/compilers/gcc-4.4) {
gettext which; inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs
binutilsCross = binutilsCross; gettext which;
libcCross = libcCross; binutilsCross = binutilsCross;
profiledCompiler = false; libcCross = libcCross;
enableMultilib = false; profiledCompiler = false;
# cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug. enableMultilib = false;
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug.
enableShared = if (crossSystem.arch == "sparc64") then false else true; # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818
crossStageStatic = false; enableShared = if (crossSystem.arch == "sparc64") then false else true;
cross = assert crossSystem != null; crossSystem; crossStageStatic = false;
}; cross = assert crossSystem != null; crossSystem;
});
gccCrossStageStatic = wrapGCCCross { gccCrossStageStatic = wrapGCCCross {
gcc = forceBuildDrv (gcc44_realCross.override { gcc = forceBuildDrv (gcc44_realCross.override {