Trying to remove evaluation errors in hydra nixpkgs for the cross compiler related
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:
parent
1163f22972
commit
f0ce6cfe94
@ -1974,7 +1974,8 @@ let
|
||||
cross = assert crossSystem != null; crossSystem;
|
||||
};
|
||||
|
||||
gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) {
|
||||
gcc44_realCross = lib.addMetaAttrs { platforms = []; } (
|
||||
makeOverridable (import ../development/compilers/gcc-4.4) {
|
||||
inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs
|
||||
gettext which;
|
||||
binutilsCross = binutilsCross;
|
||||
@ -1986,7 +1987,7 @@ let
|
||||
enableShared = if (crossSystem.arch == "sparc64") then false else true;
|
||||
crossStageStatic = false;
|
||||
cross = assert crossSystem != null; crossSystem;
|
||||
};
|
||||
});
|
||||
|
||||
gccCrossStageStatic = wrapGCCCross {
|
||||
gcc = forceBuildDrv (gcc44_realCross.override {
|
||||
|
Loading…
x
Reference in New Issue
Block a user