svn commit: r240006 - stable/9/share/mk

[Dimitry Andric]

Author: dim
Date: Sun Sep  2 11:44:30 2012
New Revision: 240006
URL: http://svn.freebsd.org/changeset/base/240006

Log:
  MFC r226216 (by das):
    Pass -std= flags in CFLAGS to mkdep. Without this, preprocessor tests
    for particular compiler features might be evaluated differently by
    mkdep than they would be by cc.
  
  MFC r226244 (by das):
    Also pass the -ansi flag through to mkdep (requested by bde), and fix
    a cut-and-paste-o (noticed by rdivacky).
  
  MFC r239613:
    Make sure bsd.dep.mk does not filter out -stdlib=xxx from CXXFLAGS,
    since this determines parts of the C++ include path.

Modified:
  stable/9/share/mk/bsd.dep.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.dep.mk
==============================================================================
--- stable/9/share/mk/bsd.dep.mk	Sun Sep  2 11:03:18 2012	(r240005)
+++ stable/9/share/mk/bsd.dep.mk	Sun Sep  2 11:44:30 2012	(r240006)
@@ -125,8 +125,10 @@ depend: beforedepend ${DEPENDFILE} after
 
 # Different types of sources are compiled with slightly different flags.
 # Split up the sources, and filter out headers and non-applicable flags.
-MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*}
-MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*}
+MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} \
+		${CFLAGS:M-ansi}
+MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \
+		${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*}
 
 DPSRCS+= ${SRCS}
 ${DEPENDFILE}: ${DPSRCS}