From owner-svn-src-head@freebsd.org Wed Mar 18 21:28:56 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2EBBD26DAAB; Wed, 18 Mar 2020 21:28:56 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48jNT36GBgz45Tw; Wed, 18 Mar 2020 21:28:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCAF1355; Wed, 18 Mar 2020 21:28:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02ILStoo024050; Wed, 18 Mar 2020 21:28:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02ILStwR024049; Wed, 18 Mar 2020 21:28:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003182128.02ILStwR024049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 18 Mar 2020 21:28:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359091 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 359091 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2020 21:28:56 -0000 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 # -# 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(____)