[flashrom-gerrit] Change in flashrom[master]: Makefile: Fix building on AArch64 NixOS

[Pyry Kontio (Code Review)]

Pyry Kontio has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/43140 )

Change subject: Makefile: Fix building on AArch64 NixOS
......................................................................

Makefile: Fix building on AArch64 NixOS

Signed-off-by: Pyry Kontio 
Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510
---
M Makefile
1 file changed, 8 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/43140/1

diff --git a/Makefile b/Makefile
index 803529f..6a2abd1 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,8 @@
 # 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.
-override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^#' | grep '"' | cut -f 2 -d'"'))
+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \
+    | grep -v '^#' | grep '"' | tail -1 | cut -f 2 -d'"'))

ifeq ($(TARGET_OS), Darwin)
 override CPPFLAGS += -I/opt/local/include -I/usr/local/include
@@ -460,8 +461,10 @@
 # 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 | grep -v '^#' | grep '"' | cut -f 2 -d'"'))
-override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^#'))
+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \
+    | grep -v '^#' | grep '"' | tail -1 | cut -f 2 -d'"'))
+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \
+    | grep -v '^#'))

# Disable the internal programmer on unsupported architectures (everything but x86 and mipsel)
 ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN))
@@ -1253,12 +1256,12 @@
    @printf "Target arch is "
    @# FreeBSD wc will output extraneous whitespace.
    @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' ||	\
-		( echo "unknown. Aborting."; exit 1)
+		( echo "unknown ("$(ARCH)"). Aborting."; exit 1)
    @printf "%s\n" '$(ARCH)'
    @printf "Target OS is "
    @# FreeBSD wc will output extraneous whitespace.
    @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' ||	\
-		( echo "unknown. Aborting."; exit 1)
+		( echo "unknown ("$(TARGET_OS)"). Aborting."; exit 1)
    @printf "%s\n" '$(TARGET_OS)'
 ifeq ($(TARGET_OS), libpayload)
    @$(CC) --version 2>&1 | grep -q coreboot || \