diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2013-02-09 13:08:03 +0800 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2013-02-11 14:34:17 +0100 |
| commit | ebae438bf25514fe058aa9262adfe6625786da43 (patch) | |
| tree | 82a2631c1db8056de98c6cb28f115c712987e6da /util | |
| parent | 3d990ffc88f5d54f32de28cc6a2a87f490bd701a (diff) | |
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 having GNU make as "gmake"), building acpica will fail. We should
use the correct path of make $(MAKE).
Verified to build on FreeBSD 9.0 with gcc 4.7 from ports. Note, the shipped gcc
in FreeBSD 9.0 is 4.2.1 and needs more patches to remove -Wbad-function-case and
-Wempty-body. That should be fixed in a future patch.
Change-Id: Iacbf5a05e84a8a53d9d3e783a10131de603282c9
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2333
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'util')
| -rw-r--r-- | util/crossgcc/patches/acpica-unix-20121114_override_make.patch | 69 |
1 files changed, 69 insertions, 0 deletions
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 0000000000..055db0a2e3 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20121114_override_make.patch @@ -0,0 +1,69 @@ +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 ""; \ |