From owner-svn-src-projects@freebsd.org Tue Oct 31 02:53:00 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6CBAE4A8A7 for ; Tue, 31 Oct 2017 02:53:00 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id B4EDA83454; Tue, 31 Oct 2017 02:53:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V2qxKA018289; Tue, 31 Oct 2017 02:52:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V2qxA3018288; Tue, 31 Oct 2017 02:52:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710310252.v9V2qxA3018288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 31 Oct 2017 02:52:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325203 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 325203 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2017 02:53:01 -0000 Author: ngie Date: Tue Oct 31 02:52:59 2017 New Revision: 325203 URL: https://svnweb.freebsd.org/changeset/base/325203 Log: Shuffle MK_COVERAGE conditionals around Modified: projects/runtime-coverage/share/mk/src.opts.mk Modified: projects/runtime-coverage/share/mk/src.opts.mk ============================================================================== --- projects/runtime-coverage/share/mk/src.opts.mk Tue Oct 31 02:52:36 2017 (r325202) +++ projects/runtime-coverage/share/mk/src.opts.mk Tue Oct 31 02:52:59 2017 (r325203) @@ -218,10 +218,16 @@ __TT=${MACHINE} # This means that architectures that have GCC 4.2 as default can not # build Clang without using an external compiler. +# Note about MK_COVERAGE: +# +# clang and gcc 4.8+ (c++11 supporting compilers) support -fprofile-dir and +# can compile lib/libclang_rt/profile . libgcov, etc, in base is a dead end +# that I do not wish to support. + .if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \ ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386") # Clang is enabled, and will be installed as the default /usr/bin/cc. -__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD +__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC COVERAGE LLD __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC .elif ${COMPILER_FEATURES:Mc++11} && ${__T:Mriscv*} == "" && ${__T} != "sparc64" # If an external compiler that supports C++11 is used as ${CC} and Clang @@ -229,10 +235,13 @@ __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC # default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX GPL_DTC __DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD +# Some gcc cross-toolchain packages are currently broken: bug 223174. +BROKEN_OPTIONS+=COVERAGE .else # Everything else disables Clang, and uses GCC instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD +BROKEN_OPTIONS+=COVERAGE .endif # In-tree binutils/gcc are older versions without modern architecture support. .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" @@ -290,15 +299,6 @@ BROKEN_OPTIONS+=PROFILE __DEFAULT_YES_OPTIONS+=CXGBETOOL .else __DEFAULT_NO_OPTIONS+=CXGBETOOL -.endif - -# clang and gcc 4.8+ (c++11 supporting compilers) support -fprofile-dir and -# can compile lib/libclang_rt/profile . libgcov, etc, in base is a dead end -# that I (ngie) do not wish to support with MK_COVERAGE. -# -# NB: some gcc cross-toolchain packages are currently broken: bug 223174. -.if !${COMPILER_FEATURES:Mc++11} -BROKEN_OPTIONS+=COVERAGE .endif .include