From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 May 2014 21:37:56 +0000 (+0200)
Subject: Merge branch 'cacti-update' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d9c6910d5498fd0a3756441fb3b3100d1520fe71;hp=776029bbd3a33641dcafbf0518841a4a0c2cfe77

Merge branch 'cacti-update' into next
---

diff --git a/doc/make.sh-usage b/doc/make.sh-usage
index c025a5c32..78a73efac 100644
--- a/doc/make.sh-usage
+++ b/doc/make.sh-usage
@@ -13,3 +13,11 @@ Maintainer / advanced commands
     toolchain : Create our own toolchain package to save 20% of build time.
         shell : Enter a shell inside the chroot, used to tune lfs script
 		  and / or during kernel upgrade to rebuild a new .config
+
+
+Options:
+    --target=[armv5tel|i586] : Cross-compile for this target architecture.
+                               Uses the QEMU emulator if needed to virtualise
+                               the desired target architecture.
+                               Can be permanently set with TARGET_ARCH= in
+                               .config.
diff --git a/make.sh b/make.sh
index 3f30a23ae..277d29e8f 100755
--- a/make.sh
+++ b/make.sh
@@ -65,12 +65,16 @@ mkdir $BASEDIR/log/ 2>/dev/null
 # Include funtions
 . tools/make-functions
 
-configure_target "default"
-
 if [ -f .config ]; then
 	. .config
 fi
 
+if [ -n "${TARGET_ARCH}" ]; then
+	configure_target "${TARGET_ARCH}"
+else
+	configure_target "default"
+fi
+
 if [ -z $EDITOR ]; then
 	for i in nano emacs vi; do
 		EDITOR=$(which $i 2>/dev/null)