[commit] r1930 - cpu/arm/mmp2/build forth/lib

[repository service]

Author: wmb
Date: Wed Aug 11 07:17:39 2010
New Revision: 1930
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1930

Log:
ARM - still more tweaking for smooth cross-building.

Modified:
   cpu/arm/mmp2/build/Makefile
   forth/lib/build.sh

Modified: cpu/arm/mmp2/build/Makefile
==============================================================================
--- cpu/arm/mmp2/build/Makefile	Wed Aug 11 07:06:53 2010	(r1929)
+++ cpu/arm/mmp2/build/Makefile	Wed Aug 11 07:17:39 2010	(r1930)
@@ -2,7 +2,7 @@
 CPU := $(shell uname -m)

# We only need to build the native wrapper if we are compiling on an ARM host
-ifeq ($CPU, arm)
+ifeq ($(findstring arm,${CPU}),arm)
    NATIVEWRAPPER=../../${OS}/forth
 endif

Modified: forth/lib/build.sh
==============================================================================
--- forth/lib/build.sh	Wed Aug 11 07:06:53 2010	(r1929)
+++ forth/lib/build.sh	Wed Aug 11 07:17:39 2010	(r1930)
@@ -45,8 +45,7 @@
         i586)  CPUNAME=x86 ;;
    i686)  CPUNAME=x86 ;;
         mips)  CPUNAME=mips ;;
-        arm)   CPUNAME=arm ;;
-        arm32) CPUNAME=arm ;;
+        arm*)  CPUNAME=arm ;;
         sun3)  CPUNAME=m68k ;;
         *)     CPUNAME=${MACHNAME} ;;
     esac