From owner-svn-src-projects@freebsd.org Mon Oct 23 08:02:05 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 03279E449A7 for ; Mon, 23 Oct 2017 08:02:05 +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 C71B966CE6; Mon, 23 Oct 2017 08:02:04 +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 v9N8233Z032052; Mon, 23 Oct 2017 08:02:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N8231r032051; Mon, 23 Oct 2017 08:02:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710230802.v9N8231r032051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 23 Oct 2017 08:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324912 - 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: 324912 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: Mon, 23 Oct 2017 08:02:05 -0000 Author: ngie Date: Mon Oct 23 08:02:03 2017 New Revision: 324912 URL: https://svnweb.freebsd.org/changeset/base/324912 Log: In the search of a perfect knob pairing Why in the heck is it so dang complicated now? 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 Mon Oct 23 07:56:56 2017 (r324911) +++ projects/runtime-coverage/share/mk/src.opts.mk Mon Oct 23 08:02:03 2017 (r324912) @@ -278,9 +278,6 @@ BROKEN_OPTIONS+=LIBSOFT .if ${__T:Mmips*} BROKEN_OPTIONS+=SSP .endif -.if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} -BROKEN_OPTIONS+=COVERAGE -.endif .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} BROKEN_OPTIONS+=EFI .endif @@ -324,9 +321,6 @@ MK_${var}:= no # Order is somewhat important. # .if !${COMPILER_FEATURES:Mc++11} -# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning -# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . -MK_COVERAGE:= no MK_LLVM_LIBUNWIND:= no .endif @@ -429,6 +423,13 @@ MK_CLANG_EXTRAS:= no MK_CLANG_FULL:= no .endif +# XXX: COMPILER_FEATURES and TARGET lies! +.if ${MK_CLANG} == "no" && ${MK_GCC} != "no" +# gcc 4.2.1 (base) is a dead end. It lacks some niceties that would cleaning +# integrate the output with the design of MK_COVERAGE, e.g., -fprofile-dir . +MK_COVERAGE:= no +.endif + # # MK_* options whose default value depends on another option. # @@ -474,9 +475,7 @@ MK_${var}_SUPPORT:= yes MK_LLDB:= no .endif -.if ${COMPILER_TYPE} == "gcc" -.if ${COMPILER_VERSION} == 40201 -.elif ${COMPILER_VERSION} >= 40800 +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. # while in theory we could build it with that, we don't want to do # that since it creates too much confusion for too little gain. @@ -485,7 +484,6 @@ MK_LLDB:= no # and to support 'make delete-old' when supplying an external toolchain. MK_GNUCXX:=no MK_GCC:=no -.endif .endif .endif # !target(____)