Module Name:    src
Committed By:   maya
Date:           Tue Sep 24 19:19:49 UTC 2019

Modified Files:
        src/external/mit/expat/lib/libexpat: Makefile

Log Message:
Unless we add --sysroot, the netbsd src tree headers won't be used.
Do so, so we don't rely on the build machine to have <endian.h> for
this macro check.

Using ${CPPFLAGS} rather than my own encoding of --sysroot, since it
already includes it.

Tested by agc, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/lib/libexpat/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/expat/lib/libexpat/Makefile
diff -u src/external/mit/expat/lib/libexpat/Makefile:1.3 src/external/mit/expat/lib/libexpat/Makefile:1.4
--- src/external/mit/expat/lib/libexpat/Makefile:1.3	Mon Sep 23 17:20:41 2019
+++ src/external/mit/expat/lib/libexpat/Makefile	Tue Sep 24 19:19:49 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/09/23 17:20:41 maya Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/24 19:19:49 maya Exp $
 
 .include <bsd.init.mk>
 
@@ -36,7 +36,7 @@ dependall: all
 
 expat.pc: expat_config.h expat.pc.in
 	@(V=$$( (echo '#include <expat_config.h>'; echo PACKAGE_VERSION) | \
-	    ${CC} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
+	    ${CC} ${CPPFLAGS} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
 	    ${TOOL_SED} -e s/@VERSION@/$$V/ < ${.CURDIR}/expat.pc.in \
 	    > ${.TARGET})
 

Reply via email to