1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-26 07:55:01 +00:00

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
This commit is contained in:
Ed Maste 2016-01-19 17:40:29 +00:00
parent 00912a2021
commit 0c9eb4d63a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=294331

View File

@ -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}