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

Adding assertions for the cross-toolchain attributes, so noone feels tempted 

to build them without setting a crossSystem to build for.

svn path=/nixpkgs/trunk/; revision=20459
This commit is contained in:
Lluís Batlle i Rossell 2010-03-07 00:05:51 +00:00
parent dddd34bc4e
commit 7858a1d7d8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1956,7 +1956,7 @@ let
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
crossStageStatic = false; crossStageStatic = false;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) { gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) {
@ -1970,7 +1970,7 @@ let
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818
enableShared = if (crossSystem.arch == "sparc64") then false else true; enableShared = if (crossSystem.arch == "sparc64") then false else true;
crossStageStatic = false; crossStageStatic = false;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gccCrossStageStatic = wrapGCCCross { gccCrossStageStatic = wrapGCCCross {
@ -1982,14 +1982,14 @@ let
}); });
libc = null; libc = null;
binutils = binutilsCross; binutils = binutilsCross;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gccCrossStageFinal = wrapGCCCross { gccCrossStageFinal = wrapGCCCross {
gcc = forceBuildDrv gcc44_realCross; gcc = forceBuildDrv gcc44_realCross;
libc = libcCross; libc = libcCross;
binutils = binutilsCross; binutils = binutilsCross;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43.gcc.override { gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43.gcc.override {
@ -2858,7 +2858,7 @@ let
binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils { binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
inherit stdenv fetchurl; inherit stdenv fetchurl;
noSysDirs = true; noSysDirs = true;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
bison = bison23; bison = bison23;
@ -5874,7 +5874,7 @@ let
linuxHeadersCross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { linuxHeadersCross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl; inherit stdenv fetchurl perl;
cross = crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {