Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58248 )
Change subject: Makefile: reorder ARCH and ENDIAN test ......................................................................
Makefile: reorder ARCH and ENDIAN test
Change-Id: Ia1b3f0257aaeebb355700b65c51a2ba70b80d5ae Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.de --- M Makefile 1 file changed, 9 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/58248/1
diff --git a/Makefile b/Makefile index bc0047f..8b8611b 100644 --- a/Makefile +++ b/Makefile @@ -158,12 +158,17 @@ CC = gcc endif
-# Determine the destination OS. -# IMPORTANT: The following line must be placed before TARGET_OS is ever used -# (of course), but should come after any lines setting CC because the line -# below uses CC itself. +# Determine the destination OS, architecture and endian +# IMPORTANT: The following line must be placed before TARGET_OS, ARCH or ENDIAN +# is ever used (of course), but should come after any lines setting CC because +# the line below uses CC itself. override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ | tail -1 | cut -f 2 -d'"')) +override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ + | tail -1 | cut -f 2 -d'"')) +override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ + | tail -1)) +
ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include @@ -242,19 +247,6 @@ CONFIG_LINUX_I2C_HELPER = yes endif
-############################################################################### -# General architecture-specific settings. -# Like above for the OS, below we verify user-supplied options depending on the target architecture. - -# 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. -override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ - | tail -1 | cut -f 2 -d'"')) -override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ - | tail -1)) - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) $(call mark_unsupported,CONFIG_INTERNAL)