svn commit: r266221 - in projects/bmake/gnu/lib: libstdc++ libsupc++

[Simon J. Gerraty]

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