summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-01-19 17:40:29 +0000
committeremaste <emaste@FreeBSD.org>2016-01-19 17:40:29 +0000
commit834fb5aff44e0a606772591d869016a1d8d9aa95 (patch)
tree152f191b284c7c14b9d09b26047cfa482fe18e30 /gnu
parent0a44f26c1cd3f33ea9a66444e35729d295083ee3 (diff)
downloadFreeBSD-src-834fb5aff44e0a606772591d869016a1d8d9aa95.zip
FreeBSD-src-834fb5aff44e0a606772591d869016a1d8d9aa95.tar.gz
Remove local override for .cpp.o and .cpp.po rules
The local build rule used to set -fvisibility=hidden and -fPIC, in addition to -fexceptions and -D defines that had no effect. With -fvisibility=hidden and -fPIC in STATIC_CXXFLAGS the standard bsd.lib.mk rules are suitable for libgcc_s's C++ source. PR: 206381 Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libgcc/Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 040fdff..ec3c7f4 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -89,6 +89,7 @@ CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR}
CXXFLAGS+= -std=c++11
.endif
CXXFLAGS+= -fno-rtti
+STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
.else # MK_LLVM_LIBUNWIND
@@ -204,8 +205,6 @@ HIDE = -fvisibility=hidden -DHIDE_EXPORTS
CC_T = ${CC} -c ${CFLAGS} ${HIDE} -fPIC
CC_P = ${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
CC_S = ${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
-CXX_T = ${CXX} -c ${CXXFLAGS} ${HIDE} -fPIC
-CXX_P = ${CXX} -c ${CXXFLAGS} ${HIDE} -p -fPIC
#-----------------------------------------------------------------------
#
@@ -326,12 +325,6 @@ ${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
.endfor
-.for _src in ${LIB2ADDEHSTATIC:M*.cpp}
-${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
- ${CXX_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
-${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
- ${CXX_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
-.endfor
.for _src in ${LIB2ADDEHSHARED:M*.c}
${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
OpenPOWER on IntegriCloud