svn commit: r239695 - in head/gnu/lib: libstdc++ libsupc++

[Dimitry Andric]

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 at 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