d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src.opts.mk: remove remaining support for pre-C++11 C++ compilers

Browse Source 
Delete the conditions that forcibly disabled GOOGLETEST and LLDB for
pre-C++11 C++ compilers, since we no longer support such compilers.

Also delete the complicated method of defaulting LIBCPLUSPLUS to YES.

Prodded by:	kevans
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2020-03-18 21:28:55 +00:00
parent c105f5c1fa
commit 5236e8d427
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
share/mk/src.opts.mk
View File

@ -125,6 +125,7 @@ __DEFAULT_YES_OPTIONS = \
LDNS \
LDNS_UTILS \
LEGACY_CONSOLE \
LIBCPLUSPLUS \
LIBPTHREAD \
LIBTHR \
LLD \
@ -385,36 +386,10 @@ __DEFAULT_NO_OPTIONS+=OPENMP
.include <bsd.mkopt.mk>
#
# MK_* options that default to "yes" if the compiler is a C++11 compiler.
#
.for var in \
LIBCPLUSPLUS
.if !defined(MK_${var})
.if ${COMPILER_FEATURES:Mc++11}
.if defined(WITHOUT_${var})
MK_${var}:= no
.else
MK_${var}:= yes
.endif
.else
.if defined(WITH_${var})
MK_${var}:= yes
.else
MK_${var}:= no
.endif
.endif
.endif
.endfor
#
# Force some options off if their dependencies are off.
# Order is somewhat important.
#
.if !${COMPILER_FEATURES:Mc++11}
MK_GOOGLETEST:= no
.endif
.if ${MK_CAPSICUM} == "no"
MK_CASPER:= no
.endif
@ -554,8 +529,4 @@ MK_${vv:H}:= ${MK_${vv:T}}
# Set defaults for the MK_*_SUPPORT variables.
#
.if !${COMPILER_FEATURES:Mc++11}
MK_LLDB:= no
.endif
.endif # !target(__<src.opts.mk>__)