diff options
| author | dim <dim@FreeBSD.org> | 2012-08-25 23:08:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-08-25 23:08:24 +0000 |
| commit | 75d2b5c3879aa6b619bc2027fecf74046ae11837 (patch) | |
| tree | 37ad73c5b6eb22d067f9a16956653f5bf2ba7b52 /gnu/lib | |
| parent | a5e624d394c2841c936f6970a984371da27e257c (diff) | |
| download | FreeBSD-src-75d2b5c3879aa6b619bc2027fecf74046ae11837.zip FreeBSD-src-75d2b5c3879aa6b619bc2027fecf74046ae11837.tar.gz | |
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@kbh.biglobe.ne.jp>
MFC after: 2 weeks
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libstdc++/Makefile | 1 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index c373442..14bb041 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -22,6 +22,7 @@ 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} diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index a651989..76fa101 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -24,6 +24,7 @@ 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 |
