From owner-svn-src-projects@FreeBSD.ORG  Fri May 16 14:40:08 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2F7FDC37;
 Fri, 16 May 2014 14:40:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D8FF25CE;
 Fri, 16 May 2014 14:40:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GEe7Uw074319;
 Fri, 16 May 2014 14:40:07 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GEe7ei074316;
 Fri, 16 May 2014 14:40:07 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405161440.s4GEe7ei074316@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 16 May 2014 14:40:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r266221 - in projects/bmake/gnu/lib: libstdc++ libsupc++
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 14:40:08 -0000

Author: sjg
Date: Fri May 16 14:40:07 2014
New Revision: 266221
URL: http://svnweb.freebsd.org/changeset/base/266221

Log:
  Fix building libstdc++ with clang
  
  Reviewed by:	theraven

Modified:
  projects/bmake/gnu/lib/libstdc++/Makefile
  projects/bmake/gnu/lib/libsupc++/Makefile

Modified: projects/bmake/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/bmake/gnu/lib/libstdc++/Makefile	Fri May 16 14:28:55 2014	(r266220)
+++ projects/bmake/gnu/lib/libstdc++/Makefile	Fri May 16 14:40:07 2014	(r266221)
@@ -634,7 +634,6 @@ CLEANFILES+=	${VERSION_MAP}
 
 .include <bsd.lib.mk>
 
-# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
-CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
-
 CXXFLAGS.clang+= -stdlib=libstdc++
+CXXFLAGS+= -std=gnu++98
+

Modified: projects/bmake/gnu/lib/libsupc++/Makefile
==============================================================================
--- projects/bmake/gnu/lib/libsupc++/Makefile	Fri May 16 14:28:55 2014	(r266220)
+++ projects/bmake/gnu/lib/libsupc++/Makefile	Fri May 16 14:40:07 2014	(r266221)
@@ -54,7 +54,5 @@ VERSION_MAP=	${.CURDIR}/Version.map
 
 .include <bsd.lib.mk>
 
-# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
-CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
-
 CXXFLAGS.clang+= -stdlib=libstdc++
+CXXFLAGS+= -std=gnu++98