Commit 44ffd58a authored by Uwe Hermann's avatar Uwe Hermann
Browse files

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: default avatarUwe Hermann <uwe@hermann-uwe.de>
Acked-by: default avatarStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
parent 394ee783
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment