diff options
author | Uwe Hermann <uwe@hermann-uwe.de> | 2011-08-20 14:16:00 +0000 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-08-20 14:16:00 +0000 |
commit | 33197702d67d11debbe9bfb51b7a05acc801932e (patch) | |
tree | e50bb73a0025f56c3ea9b04a6d157f0161785d3a /Makefile | |
parent | ed117a704bec686bf0380250b33c4b0194c84ec0 (diff) | |
download | flashrom-33197702d67d11debbe9bfb51b7a05acc801932e.zip flashrom-33197702d67d11debbe9bfb51b7a05acc801932e.tar.gz |
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
Corresponding to flashrom svn r1418.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -37,9 +37,6 @@ ifeq ($(WARNERROR), yes) 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 @@ override CONFIG_FT2232_SPI = no 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) |