Author: dim
Date: Tue Oct 23 18:57:20 2012
New Revision: 241960
URL: http://svn.freebsd.org/changeset/base/241960
Log:
For building GNU libstdc++ and libsupc++, filter out libc++-specific and
-std= flags above c++98 or gnu++98 from CXXFLAGS *after* including
bsd.lib.mk, otherwise some additions to CXXFLAGS done in bsd.*.mk might
not be preserved.
MFC after: 1 week
Modified:
head/gnu/lib/libstdc++/Makefile
head/gnu/lib/libsupc++/Makefile
Modified: head/gnu/lib/libstdc++/Makefile
==============================================================================
--- head/gnu/lib/libstdc++/Makefile Tue Oct 23 18:45:32 2012
(r241959)
+++ head/gnu/lib/libstdc++/Makefile Tue Oct 23 18:57:20 2012
(r241960)
@@ -22,7 +22,6 @@ 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}
@@ -626,3 +625,6 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre
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]}
Modified: head/gnu/lib/libsupc++/Makefile
==============================================================================
--- head/gnu/lib/libsupc++/Makefile Tue Oct 23 18:45:32 2012
(r241959)
+++ head/gnu/lib/libsupc++/Makefile Tue Oct 23 18:57:20 2012
(r241960)
@@ -24,7 +24,6 @@ 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
@@ -43,3 +42,6 @@ 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]}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
