[v2] r4091 - trunk/coreboot-v2/util/abuild

Author: stepan
Date: 2009-04-11 01:02:48 +0200 (Sat, 11 Apr 2009)
New Revision: 4091

Modified:
   trunk/coreboot-v2/util/abuild/abuild
Log:
move architecture override before cross compiler detection, or the Sandpoint
skeleton will have get a cross compiler before it gets the architecture set 
to SKIP. Pretty much build system internal, so self-acked.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/util/abuild/abuild
===================================================================
--- trunk/coreboot-v2/util/abuild/abuild	2009-04-10 21:05:56 UTC (rev 4090)
+++ trunk/coreboot-v2/util/abuild/abuild	2009-04-10 23:02:48 UTC (rev 4091)
@@ -14,8 +14,8 @@

#set -x # Turn echo on....

-ABUILD_DATE="April 3rd, 2009"
-ABUILD_VERSION="0.8"
+ABUILD_DATE="April 10th, 2009"
+ABUILD_VERSION="0.8.1"

# Where shall we place all the build trees?
 TARGET=$( pwd )/coreboot-builds
@@ -329,6 +329,12 @@
    MAINBOARD=$2
    TARCH=$( architecture $VENDOR $MAINBOARD )

+	# Allow architecture override in an abuild.info file.
+	# This is used for the Motorola Sandpoint, which is not a real target
+	# but a skeleton target for the Sandpoint X3.
+	[ -r "$LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info" ] && \
+		source $LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info
+
    # default setting

CC="${CROSS_COMPILE}gcc"
@@ -355,10 +361,7 @@
    xml ""
    xml "  <architecture>$TARCH</architecture>"
    xml ""
-	
-	[ -r "$LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info" ] && \
-		source $LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info
-	
+
    if [ "$ARCH" = "$TARCH" -o $found_crosscompiler = true ]; then
    	printf " ($TARCH: ok)\n"
    else