From 344c267e9fe5c6a39efdbf0305bd873d5bef65f3 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 3 Mar 2012 10:56:11 -0600
Subject: Fix from Georgi Chorbadzhiyski to make cross compiling more robust.

---
 scripts/genconfig.sh | 2 +-
 scripts/make.sh      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh
index 4ecff254..449ee1ea 100755
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -13,7 +13,7 @@ probeconfig()
   # Probe for container support on target
 
   echo -e "# container support\nconfig TOYBOX_CONTAINER\n\tbool" || return 1
-  $CC -c -xc -o /dev/null - << EOF
+  ${CROSS_COMPILE}${CC} -c -xc -o /dev/null - 2>/dev/null << EOF
     #include <sched.h>
     int x=CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|CLONE_NEWNET;
 EOF
diff --git a/scripts/make.sh b/scripts/make.sh
index e2236eac..e0f6d4b3 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -102,9 +102,9 @@ do_loudly()
   "$@"
 }
 
-do_loudly $CC $CFLAGS -I . -o toybox_unstripped $OPTIMIZE main.c lib/*.c \
-  $TOYFILES -Wl,--as-needed,-lutil,--no-as-needed || exit 1
-do_loudly $STRIP toybox_unstripped -o toybox || exit 1
+do_loudly ${CROSS_COMPILE}${CC} $CFLAGS -I . -o toybox_unstripped $OPTIMIZE \
+  main.c lib/*.c $TOYFILES -Wl,--as-needed,-lutil,--no-as-needed || exit 1
+do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
 # gcc 4.4's strip command is buggy, and doesn't set the executable bit on
 # its output the way SUSv4 suggests it do so.
 do_loudly chmod +x toybox || exit 1
-- 
cgit v1.2.3