From 2c7fa189fb2ac1c4ef689398ab13a4465448856a Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Mon, 16 Nov 2009 23:21:13 +0000
Subject: Making the definition of the cross compiling target an attribute set.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
---
 pkgs/stdenv/linux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/stdenv/linux')

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 228c626341ef..9a90e4b28df8 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -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;
-- 
cgit 1.4.1