GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
coreboot-kgpe-d16/util/crossgcc/patches/acpica-unix-20121114_overri...

70 lines
2.0 KiB
Diff
Raw Normal View History

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>
2013-02-09 06:08:03 +01:00
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 ""; \