Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Oct 2017 21:39:58 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r324874 - projects/runtime-coverage/share/mk
Message-ID:  <201710222139.v9MLdwD2072370@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Oct 22 21:39:58 2017
New Revision: 324874
URL: https://svnweb.freebsd.org/changeset/base/324874

Log:
  Remove BROKEN_OPTIONS/MK_COVERAGE=no for gcc cross-toolchain reliant archs
  
  The cross-toolchain gcc toolchains aren't installing libgcov.a, but the host
  toolchain variants are. Don't hack around broken packages in the base system.
  
  PR:		223174

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	Sun Oct 22 21:34:37 2017	(r324873)
+++ projects/runtime-coverage/share/mk/src.opts.mk	Sun Oct 22 21:39:58 2017	(r324874)
@@ -240,7 +240,6 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BO
 .endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=PROFILE # "sorry, unimplemented: profiler support for RISC-V"
-BROKEN_OPTIONS+=COVERAGE # External toolchain (GNU-based) doesn't have libgcov.a .
 BROKEN_OPTIONS+=TESTS   # "undefined reference to `_Unwind_Resume'"
 BROKEN_OPTIONS+=CXX     # "libcxxrt.so: undefined reference to `_Unwind_Resume_or_Rethrow'"
 .endif
@@ -292,10 +291,6 @@ __DEFAULT_YES_OPTIONS+=CXGBETOOL
 .else
 __DEFAULT_NO_OPTIONS+=CXGBETOOL
 .endif
-.if ${__T} == "aarch64" || ${__T} == "arm" || ${__T} == "armeb" || \
-    ${__T} == "armv6" || ${__T} == "armv7"
-BROKEN_OPTIONS+=COVERAGE
-.endif
 
 .include <bsd.mkopt.mk>
 
@@ -473,9 +468,7 @@ MK_${var}_SUPPORT:= yes
 MK_LLDB:=	no
 .endif
 
-.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800
-# Cross-toolchains unfortunately don't install libgcov.a .
-MK_COVERAGE:=no
+.if ${COMPILER_TYPE} == "gcc"
 # 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.



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