Making the definition of the cross compiling target an attribute set.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
This commit is contained in:
Lluís Batlle i Rossell
2009-11-16 23:21:13 +00:00
parent d82c7e0a69
commit 2c7fa189fb
11 changed files with 51 additions and 42 deletions
+2 -2
View File
@@ -206,7 +206,7 @@ rec {
# dependency (`nix-store -qR') on bootstrapTools.
stdenvLinux = import ../generic {
name = "stdenv-linux" +
stdenvLinuxBoot3Pkgs.lib.optionalString (cross != null) "-${cross}";
stdenvLinuxBoot3Pkgs.lib.optionalString (cross != null) "-${cross.config}";
inherit system cross;
@@ -221,7 +221,7 @@ rec {
postHook = if (cross != null) then
(builtins.toFile "cross-posthook.sh" ''
configureFlags="$configureFlags --build=${system} --host=${cross}"
configureFlags="$configureFlags --build=${system} --host=${cross.config}"
dontStrip=1
'')
else null;