From owner-svn-src-head@FreeBSD.ORG  Sat Aug 25 23:08:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49297106564A;
	Sat, 25 Aug 2012 23:08:25 +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 342508FC0C;
	Sat, 25 Aug 2012 23:08:25 +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 q7PN8PM1011084;
	Sat, 25 Aug 2012 23:08:25 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PN8O33011081;
	Sat, 25 Aug 2012 23:08:24 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208252308.q7PN8O33011081@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 25 Aug 2012 23:08:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239695 - in head/gnu/lib: libstdc++ libsupc++
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 23:08:25 -0000

Author: dim
Date: Sat Aug 25 23:08:24 2012
New Revision: 239695
URL: http://svn.freebsd.org/changeset/base/239695

Log:
  For building libstdc++ and libsupc++, filter out any -stdlib=libc++
  option from CXXFLAGS, otherwise these libraries will not build.
  Similarly, filter out any -std=xxx options that aren't supported.
  
  Submitted by:	Yamaya Takashi <yamayan@kbh.biglobe.ne.jp>
  MFC after:	2 weeks

Modified:
  head/gnu/lib/libstdc++/Makefile
  head/gnu/lib/libsupc++/Makefile

Modified: head/gnu/lib/libstdc++/Makefile
==============================================================================
--- head/gnu/lib/libstdc++/Makefile	Sat Aug 25 23:03:45 2012	(r239694)
+++ head/gnu/lib/libstdc++/Makefile	Sat Aug 25 23:08:24 2012	(r239695)
@@ -22,6 +22,7 @@ CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
 DPADD=		${LIBM}

Modified: head/gnu/lib/libsupc++/Makefile
==============================================================================
--- head/gnu/lib/libsupc++/Makefile	Sat Aug 25 23:03:45 2012	(r239694)
+++ head/gnu/lib/libsupc++/Makefile	Sat Aug 25 23:08:24 2012	(r239695)
@@ -24,6 +24,7 @@ CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}
 CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
 PO_CXXFLAGS=    ${CXXFLAGS:N-ffunction-sections}
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h