Author: emaste
Date: Wed Mar 18 21:28:55 2020
New Revision: 359091
URL: https://svnweb.freebsd.org/changeset/base/359091
Log:
src.opts.mk: remove remaining support for pre-C++11 C++ compilers
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
Modified:
head/share/mk/src.opts.mk
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Wed Mar 18 21:24:34 2020 (r359090)
+++ head/share/mk/src.opts.mk Wed Mar 18 21:28:55 2020 (r359091)
@@ -125,6 +125,7 @@ __DEFAULT_YES_OPTIONS = \
LDNS \
LDNS_UTILS \
LEGACY_CONSOLE \
+ LIBCPLUSPLUS \
LIBPTHREAD \
LIBTHR \
LLD \
@@ -386,35 +387,9 @@ __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
@@ -553,9 +528,5 @@ 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>__)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
