aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2021-08-26 18:53:18 +0000
committerDimitry Andric <dim@FreeBSD.org>2021-08-29 10:51:27 +0000
commit729a19f2cd01aac78d08fb88d8467b1a2376d81b (patch)
treeadaa483fd2812548877b563011b4ff0c03eeebbd
parent7f14439a3a78f084f705e24a055c85044f35d39a (diff)
downloadsrc-729a19f2cd01aac78d08fb88d8467b1a2376d81b.tar.gz
src-729a19f2cd01aac78d08fb88d8467b1a2376d81b.zip
Cleanup compiler warning flags in lib/libefivar/Makefile
There is no need to set -Wno-unused-parameter twice, and instead of appending to CFLAGS, append to CWARNFLAGS instead. While here, add -Wno-unused-but-set-variable for the sake of clang 13.0.0. (cherry picked from commit f643997a1761689ef9108d69b86d42881ea0ab1c)
-rw-r--r--lib/libefivar/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
index 3c6b17333407..c1503f4e5b62 100644
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -43,8 +43,7 @@ MAN= efivar.3
CFLAGS+= -I${EFIBOOT}/include
CFLAGS+= -I${.CURDIR} -I${EDK2INC}
-
-CFLAGS.efivar-dp-format.c=-Wno-unused-parameter
+CFLAGS+= -fno-strict-aliasing
MLINKS+=efivar.3 efi_set_variables_supported.3 \
efivar.3 efi_del_variable.3 \
@@ -65,4 +64,9 @@ WARNS?= 9
.include <bsd.lib.mk>
-CFLAGS+= -fno-strict-aliasing -Wno-cast-align -Wno-unused-parameter
+CWARNFLAGS+= -Wno-cast-align
+CWARNFLAGS+= -Wno-unused-parameter
+
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 130000
+CWARNFLAGS+= -Wno-unused-but-set-variable
+.endif