Module Name: src
Committed By: plunky
Date: Sat Jul 19 17:19:22 UTC 2014
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
when calling mkdep, pass any -std=* flags for C and C++ source files
to ensure that any definitions this implies are set
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.80 src/share/mk/bsd.dep.mk:1.81
--- src/share/mk/bsd.dep.mk:1.80 Thu Dec 5 22:49:33 2013
+++ src/share/mk/bsd.dep.mk Sat Jul 19 17:19:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.80 2013/12/05 22:49:33 matt Exp $
+# $NetBSD: bsd.dep.mk,v 1.81 2014/07/19 17:19:22 plunky Exp $
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -61,7 +61,7 @@ _MKDEP_FILEFLAGS=
.c.d:
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
- ${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
+ ${CFLAGS:M-std=*} ${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
@@ -85,7 +85,7 @@ _MKDEP_FILEFLAGS=
.C.d .cc.d .cpp.d .cxx.d:
${_MKTARGET_CREATE}
${MKDEPCXX} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
- ${CXXFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
+ ${CXXFLAGS:M-std=*} ${CXXFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
mv ${.TARGET}.tmp ${.TARGET}
