Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 May 2019 01:48:08 +0000 (UTC)
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r348142 - projects/runtime-coverage-v2/share/mk
Message-ID:  <201905230148.x4N1m8ve036707@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Thu May 23 01:48:07 2019
New Revision: 348142
URL: https://svnweb.freebsd.org/changeset/base/348142

Log:
  Ensure that coverage-capable linkers only include lld right now

Modified:
  projects/runtime-coverage-v2/share/mk/bsd.lib.mk
  projects/runtime-coverage-v2/share/mk/bsd.prog.mk

Modified: projects/runtime-coverage-v2/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage-v2/share/mk/bsd.lib.mk	Thu May 23 01:41:49 2019	(r348141)
+++ projects/runtime-coverage-v2/share/mk/bsd.lib.mk	Thu May 23 01:48:07 2019	(r348142)
@@ -9,7 +9,7 @@
 # This forces coverage off if the compiler/linker isn't capable, as src.opts.mk
 # is not always used in time.
 .if !${COMPILER_FEATURES:Mcoverage} && \
-    (${LINKER_TYPE} == "lld" && !${LINKER_FEATURES:Mdwarfv4})
+    ${LINKER_TYPE} != "lld" || !${LINKER_FEATURES:Mdwarfv4}
 MK_COVERAGE:=	no
 .endif
 

Modified: projects/runtime-coverage-v2/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage-v2/share/mk/bsd.prog.mk	Thu May 23 01:41:49 2019	(r348141)
+++ projects/runtime-coverage-v2/share/mk/bsd.prog.mk	Thu May 23 01:48:07 2019	(r348142)
@@ -7,8 +7,8 @@
 
 # This forces coverage off if the compiler/linker isn't capable, as src.opts.mk
 # is not always used in time.
-.if !${COMPILER_FEATURES:Mcoverage} && \
-    (${LINKER_TYPE} == "lld" && !${LINKER_FEATURES:Mdwarfv4})
+.if !${COMPILER_FEATURES:Mcoverage} || \
+    ${LINKER_TYPE} != "lld" || !${LINKER_FEATURES:Mdwarfv4}
 MK_COVERAGE:=	no
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905230148.x4N1m8ve036707>