Author: uwe Date: Sat Aug 20 16:16:00 2011 New Revision: 1418 URL: http://flashrom.org/trac/flashrom/changeset/1418
Log: Makefile: Fix MinGW build, improve output with bogus CC.
As per IRC discussion, the "ARCH :=" line should be moved after any lines which set CC, as it uses CC itself. This fixes the MinGW build.
Also, add a "2>/dev/null" in the "ARCH :=" as per suggestion from Stefan Tauner to improve the output in the case CC is bogus:
Before: $ make CC=foo /bin/sh: foo: not found Checking for a C compiler... not found. make: *** [compiler] Error 1
After: $ make CC=foo Checking for a C compiler... not found. make: *** [compiler] Error 1
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
Modified: trunk/Makefile
Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Aug 20 16:14:22 2011 (r1417) +++ trunk/Makefile Sat Aug 20 16:16:00 2011 (r1418) @@ -37,9 +37,6 @@ CFLAGS += -Werror endif
-# Determine the destination processor architecture -override ARCH := $(strip $(shell LC_ALL=C $(CC) -E arch.h|grep -v '^#')) - # FIXME We have to differentiate between host and target OS architecture. OS_ARCH ?= $(shell uname) ifneq ($(OS_ARCH), SunOS) @@ -202,6 +199,12 @@ endif endif
+# Determine the destination processor architecture. +# IMPORTANT: The following line must be placed before ARCH is ever used +# (of course), but should come after any lines setting CC because the line +# below uses CC itself. In some cases we set CC based on OS_ARCH, see above. +override ARCH := $(strip $(shell LC_ALL=C $(CC) -E arch.h 2>/dev/null | grep -v '^#')) + ifeq ($(ARCH), "ppc") # There's no PCI port I/O support on PPC/PowerPC, yet. ifeq ($(CONFIG_NIC3COM), yes)