[coreboot] New patch to review for coreboot: b3addbf crossgcc: Support hosts using non-GNU make as default make.

[Hung-Te Lin (hungte@chromium.org)]

Hung-Te Lin (hungte at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2333

-gerrit

commit b3addbfb9b12fa19351466d062fe7369f76df25d
Author: Hung-Te Lin <hungte at chromium.org>
Date:   Sat Feb 9 13:08:03 2013 +0800

    crossgcc: Support hosts using non-GNU make as default make.
    
    On hosts using non-GNU make as default make program (ex, FreeBSD's default is
    bsd make and GNU make as "gmake"), buliding acpica will fail. We should pass the
    correct name of make from bulidgcc.
    
    Verified to build on FreeBSD with gcc 4.7.
    
    Change-Id: Iacbf5a05e84a8a53d9d3e783a10131de603282c9
    Signed-off-by: Hung-Te Lin <hungte at chromium.org>
---
 util/crossgcc/buildgcc                             |  2 +-
 .../acpica-unix-20121114_override_make.patch       | 80 ++++++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index eaff24d..ad2bb65 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -584,7 +584,7 @@ printf "Building IASL ${IASL_VERSION} ... "
 	cd $IASL_DIR/generate/unix
 	rm -f .failed
 	CFLAGS="$HOSTCFLAGS"
-	$MAKE CC="$CC" iasl || touch .failed
+	$MAKE MAKE="$MAKE" CC="$CC" iasl || touch .failed
 	rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed
 	if [ -d bin32 ]; then cp bin32/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi
 	if [ -d bin64 ]; then cp bin64/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi
diff --git a/util/crossgcc/patches/acpica-unix-20121114_override_make.patch b/util/crossgcc/patches/acpica-unix-20121114_override_make.patch
new file mode 100644
index 0000000..c4ce67f
--- /dev/null
+++ b/util/crossgcc/patches/acpica-unix-20121114_override_make.patch
@@ -0,0 +1,80 @@
+diff -Nurbs acpica-unix-20121114.orig/generate/unix/Makefile.common acpica-unix-20121114/generate/unix/Makefile.common
+--- acpica-unix-20121114.orig/generate/unix/Makefile.common	2012-11-15 00:22:38.000000000 +0800
++++ acpica-unix-20121114/generate/unix/Makefile.common	2013-02-09 12:11:55.994133871 +0800
+@@ -19,17 +19,17 @@
+ 	if [ $(BITS) -eq 32 ]; then \
+ 		echo "Forced 32-bit generation of $@"; \
+ 		mkdir -p obj32; \
+-		make BITS=32; \
++		$(MAKE) BITS=32; \
+ 		echo "32-bit version of $@:"; \
+ 		ls -al ../bin32/$@; \
+ 	elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+ 		mkdir -p obj64; \
+-		make BITS=64; \
++		$(MAKE) BITS=64; \
+ 		echo "64-bit version of $@:"; \
+ 		ls -al ../bin64/$@; \
+ 	else \
+ 		mkdir -p obj32; \
+-		make BITS=32; \
++		$(MAKE) BITS=32; \
+ 		echo "32-bit version of $@:"; \
+ 		ls -al ../bin32/$@; \
+ 	fi;
+@@ -47,7 +47,7 @@
+ 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ 		pwd; \
+ 		mkdir -p obj32; \
+-		make BITS=32; \
++		$(MAKE) BITS=32; \
+ 		echo "32-bit version of $$toolname:"; \
+ 		ls -al obj32/$$toolname \
+ 		); \
+@@ -61,7 +61,7 @@
+ 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ 		pwd; \
+ 		mkdir -p obj64; \
+-		make BITS=64; \
++		$(MAKE) BITS=64; \
+ 		echo "64-bit version of $$toolname:"; \
+ 		ls -al obj64/$$toolname \
+ 		); \
+@@ -73,11 +73,11 @@
+ 		echo "Removing $$toolname"; \
+ 		pwd; \
+ 		if [ -d "obj32" ] ; then \
+-			make BITS=32 clean; \
++			$(MAKE) BITS=32 clean; \
+ 			rmdir obj32; \
+ 		fi; \
+ 		if [ -d "obj64" ] ; then \
+-			make BITS=64 clean; \
++			$(MAKE) BITS=64 clean; \
+ 			rmdir obj64; \
+ 		fi; \
+ 		echo ""; \
+@@ -92,10 +92,10 @@
+ 		(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ 		pwd; \
+ 		if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+-			make BITS=64 PROG=$$toolname install; \
++			$(MAKE) BITS=64 PROG=$$toolname install; \
+ 			echo "Installed 64-bit version of $$toolname"; \
+ 		else \
+-			make BITS=32 PROG=$$toolname install; \
++			$(MAKE) BITS=32 PROG=$$toolname install; \
+ 			echo "Installed 32-bit version of $$toolname"; \
+ 		fi; \
+ 		echo ""; \
+diff -Nurbs acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config
+--- acpica-unix-20121114.orig/generate/unix/Makefile.config	2012-11-15 00:22:38.000000000 +0800
++++ acpica-unix-20121114/generate/unix/Makefile.config	2013-02-09 12:11:12.978134325 +0800
+@@ -31,6 +31,7 @@
+ PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl
+ HOST =  _CYGWIN
+ CC =    gcc
++MAKE =  make
+ 
+ #
+ # Common defines