From 585ba8c27f766a15abcab22c232170f6ae1cc0a9 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Sun, 22 Nov 2009 19:51:45 +0000
Subject: Big fixes in the cross build: - Before this changes, cflags and
 ldflags for the native and the cross compiler   got mixed. Not all the
 gcc-wrapper/gcc-cross-wrapper variables are   independant now, but enough, I
 think. - Fixed the generic stdenv expression, which did a big mess on
 buildInputs and   buildNativeInputs. Now it distinguishes when there is a
 stdenvCross or not.   Maybe we should have a single stdenv and forget about
 the stdenvCross   adapter - this could end in a stdenv a bit complex, but
 simpler than the   generic stdenv + adapter. - Added basic support in
 pkgconfig for cross-builds: a single PKG_CONFIG_PATH   now works for both the
 cross and the native compilers, but I think this   should work well for most
 cases I can think of. - I tried to fix the guile expression to cross-biuld;
 guile is built, but not   its manual, so the derivation still fails. Guile
 requires patching to   cross-build, as far as I understnad. - Made the
 glibcCross build to be done through the usage of a   gcc-cross-wrapper over
 the gcc-cross-stage-static, instead of using it   directly. - Trying to make
 physfs (a neverball dependency) cross build. - Updated the gcc expression to
 support building a cross compiler without getting   derivation variables
 mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
---
 pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh')

diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
index e5a2f5e65bb1..491de8f7f984 100644
--- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
@@ -4,7 +4,7 @@ if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
     source "$NIX_GCC_WRAPPER_START_HOOK"
 fi
 
-if test -z "$NIX_GLIBC_FLAGS_SET"; then
+if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then
     source @out@/nix-support/add-flags
 fi
 
@@ -63,28 +63,28 @@ fi
 
 
 # Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
+extraAfter=($NIX_CROSS_CFLAGS_COMPILE)
 extraBefore=()
 
 if test "$dontLink" != "1"; then
 
     # Add the flags that should only be passed to the compiler when
     # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
+    extraAfter=(${extraAfter[@]} $NIX_CROSS_CFLAGS_LINK)
 
     # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
+    # `ld-wrapper' from adding NIX_CROSS_LDFLAGS again).
+    for i in $NIX_CROSS_LDFLAGS_BEFORE; do
         extraBefore=(${extraBefore[@]} "-Wl,$i")
     done
-    for i in $NIX_LDFLAGS; do
+    for i in $NIX_CROSS_LDFLAGS; do
 	if test "${i:0:3}" = "-L/"; then
 	    extraAfter=(${extraAfter[@]} "$i")
 	else
 	    extraAfter=(${extraAfter[@]} "-Wl,$i")
 	fi
     done
-    export NIX_LDFLAGS_SET=1
+    export NIX_CROSS_LDFLAGS_SET=1
 
     if test "$NIX_STRIP_DEBUG" = "1"; then
         # Add executable-stripping flags.
-- 
cgit 1.4.1