svn commit: r324888 - projects/runtime-coverage

[Ngie Cooper]

Author: ngie
Date: Mon Oct 23 00:44:18 2017
New Revision: 324888
URL: https://svnweb.freebsd.org/changeset/base/324888

Log:
  Try unbreaking MK_COVERAGE != no with make tinderbox
  
  Compile libgcov/libprofile_rt when bootstrapping/compiling gcc/clang.
  
  Hopefully this fixes platforms still on host gcc (mips, powerpc, etc). We'll
  see after the next tinderbox cycle on universe12a.freebsd.org *eyeroll*.

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct 23 00:12:20 2017	(r324887)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct 23 00:44:18 2017	(r324888)
@@ -2261,10 +2261,14 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 # for world to have runtime coverage instrumentation.
 #
 .if ${MK_COVERAGE} != "no"
-_coverage_libs.${MK_CLANG}+=	lib/libclang_rt/profile
-_coverage_libs.${MK_GCC}+=	gnu/lib/libgcov
+.if ${WANT_COMPILER_TYPE} == "clang" || ${MK_CLANG} != "no"
+_coverage_libs+=	lib/libclang_rt/profile
 .endif
-_prereq_libs+=	${_coverage_libs.yes}
+.if ${WANT_COMPILER_TYPE} == "gcc" || ${MK_GCC} != "no"
+_coverage_libs+=	gnu/lib/libgcov
+.endif
+_prereq_libs+=	${_coverage_libs}
+.endif
 
 # These dependencies are not automatically generated:
 #