cc-wrapper: Fix for cross-compiling

Fixes #5949 Suggested by @ambrop72
2015-01-25 23:29:06 -05:00 · 2015-01-25 23:29:06 -05:00 · 9bccb95a82
commit 9bccb95a82
parent f326b7995c
2 changed files with 10 additions and 2 deletions
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@ -34,5 +34,10 @@ if [ -n "@coreutils@" ]; then
    addToSearchPath PATH @coreutils@/bin
 fi

-export CC=@real_cc@
-export CXX=@real_cxx@
+if [ -z "$crossConfig" ]; then
+    export CC=@real_cc@
+    export CXX=@real_cxx@
+else
+    export BUILD_CC=@real_cc@
+    export BUILD_CXX=@real_cxx@
+fi
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@ -85,3 +85,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then
        export NIX_CROSS_LDFLAGS="-rpath $out/lib64 -rpath-link $out/lib $NIX_CROSS_LDFLAGS"
    fi
 fi
+
+export CC=${crossConfig}-gcc
+export CXX=${crossConfig}-g++