From owner-svn-src-all@FreeBSD.ORG  Sun Sep  2 11:44:30 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BB891106566C;
	Sun,  2 Sep 2012 11:44:30 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A612B8FC08;
	Sun,  2 Sep 2012 11:44:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q82BiU0e095157;
	Sun, 2 Sep 2012 11:44:30 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q82BiUm1095154;
	Sun, 2 Sep 2012 11:44:30 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201209021144.q82BiUm1095154@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 2 Sep 2012 11:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240006 - stable/9/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Sep 2012 11:44:30 -0000

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}