diff options
| author | dim <dim@FreeBSD.org> | 2012-10-23 18:57:20 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-10-23 18:57:20 +0000 |
| commit | 36e49e1816bd5a8b656797c83df8907198f53025 (patch) | |
| tree | 6a8c47b0cdc433d77ff240b16be56e421ec477f3 /gnu/lib | |
| parent | 99da76dc3d08b3012a3cf73037a072d9467d541f (diff) | |
| download | FreeBSD-src-36e49e1816bd5a8b656797c83df8907198f53025.zip FreeBSD-src-36e49e1816bd5a8b656797c83df8907198f53025.tar.gz | |
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
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libstdc++/Makefile | 4 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index 14bb041..1005b5d 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -22,7 +22,6 @@ CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I. 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/gnu.ver 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]} diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index 76fa101..9068615 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -24,7 +24,6 @@ CFLAGS+= -I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR} 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]} |
