From 0c631f61819e680bc689d432e6c67e4e0da294fb Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Tue, 17 Nov 2009 21:14:57 +0000
Subject: Trying to move all stdenv cross-compiling details out of the stdenv
 expression, into a stdenv adapater.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18397
---
 pkgs/build-support/gcc-cross-wrapper/default.nix   | 4 ++++
 pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix
index 8acdb8356c0d..a9042dddf195 100644
--- a/pkgs/build-support/gcc-cross-wrapper/default.nix
+++ b/pkgs/build-support/gcc-cross-wrapper/default.nix
@@ -30,4 +30,8 @@ stdenv.mkDerivation {
   meta = if gcc != null then gcc.meta else
     { description = "System C compiler wrapper";
     };
+
+  passthru = {
+    inherit cross;
+  };
 }
diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
index 7a7ea8226919..e4034820fb3c 100644
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@@ -23,3 +23,6 @@ fi
 if test -n "@glibc@"; then
     PATH=$PATH:@glibc@/bin
 fi
+
+configureFlags="$configureFlags --build=$system --host=$crossConfig"
+dontStrip=1
-- 
cgit 1.4.1