From 116a8310ab93d803fa51f9ba9f3d6d0cb691e2bf Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 2 Aug 2021 13:09:28 -0400
Subject: More minor improvements to support for COMPILER=clang

A couple of places snuck in where building with COMPILER=clang didn't
work right; this makes them work again.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 include/test.mk | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/test.mk b/include/test.mk
index 68230b20..b99283f3 100644
--- a/include/test.mk
+++ b/include/test.mk
@@ -27,10 +27,11 @@ CFLAGS = $(OPTIMIZATIONS) -std=gnu11 \
 	 -fno-eliminate-unused-debug-symbols \
 	 -gpubnames \
 	 -grecord-gcc-switches \
+	 $(if $(findstring clang,$(CC)),-Wno-unknown-warning-option) \
 	 $(DEFAULT_WARNFLAGS) \
 	 -Wsign-compare \
 	 -Wno-deprecated-declarations \
-	 -Wno-unused-but-set-variable \
+	 $(if $(findstring gcc,$(CC)),-Wno-unused-but-set-variable) \
 	 -Wno-unused-variable \
 	 -Wno-pointer-sign \
 	 $(DEFAULT_WERRFLAGS) \
@@ -43,11 +44,18 @@ CFLAGS = $(OPTIMIZATIONS) -std=gnu11 \
 	 "-DDEFAULT_DEBUG_PRINT_STATE=$(DEBUG_PRINTS)"
 
 libefi-test.a :
-	$(MAKE) -C gnu-efi ARCH=$(ARCH_GNUEFI) TOPDIR=$(TOPDIR)/gnu-efi \
+	$(MAKE) -C gnu-efi \
+		COMPILER="$(COMPILER)" \
+		CC="$(CC)" \
+		ARCH=$(ARCH_GNUEFI) \
+		TOPDIR=$(TOPDIR)/gnu-efi \
 		-f $(TOPDIR)/gnu-efi/Makefile \
 		clean lib
 	mv gnu-efi/$(ARCH)/lib/libefi.a $@
-	$(MAKE) -C gnu-efi ARCH=$(ARCH_GNUEFI) TOPDIR=$(TOPDIR)/gnu-efi \
+	$(MAKE) -C gnu-efi \
+		COMPILER="$(COMPILER)" \
+		ARCH=$(ARCH_GNUEFI) \
+		TOPDIR=$(TOPDIR)/gnu-efi \
 		-f $(TOPDIR)/gnu-efi/Makefile \
 		clean
 
-- 
cgit v1.2.3