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 <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4091 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 0a0874fd6d494b70d22d4ea91e458eb72c949fdd..a60bd50fb17b79c290afbacca1f2b6683004a80c 100755 (executable)
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -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 @@ function build_target
        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 @@ function build_target
        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