Date: Tue, 31 Oct 2017 02:52:59 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325203 - projects/runtime-coverage/share/mk Message-ID: <201710310252.v9V2qxA3018288@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.mkopt.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710310252.v9V2qxA3018288>