Module Name: src
Committed By: christos
Date: Wed Jan 25 22:35:06 UTC 2023
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
fix clang build
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.28 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.29
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.28 Sun Jan 22 15:36:46 2023
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed Jan 25 17:35:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/01/22 20:36:46 christos Exp $
+# $NetBSD: Makefile,v 1.29 2023/01/25 22:35:06 christos Exp $
.include <bsd.own.mk>
@@ -291,8 +291,11 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
-I. \
-I${X11SRCDIR.${LIB}}
-CPPFLAGS.fccache.c+= -Wno-error=discarded-qualifiers
-CPPFLAGS.fccfg.c+= -Wno-error=discarded-qualifiers
+IGNORE_QUALIFIERS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+IGNORE_QUALIFIERS+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+
+CPPFLAGS.fccache.c+= ${IGNORE_QUALIFIERS}
+CPPFLAGS.fccfg.c+= ${IGNORE_QUALIFIERS}
.if ${MACHINE_ARCH:Mvax}
COPTS.fccache.c+= -O0
