svn commit: r324891 - projects/runtime-coverage

[Ngie Cooper]

Author: ngie
Date: Mon Oct 23 01:42:48 2017
New Revision: 324891
URL: https://svnweb.freebsd.org/changeset/base/324891

Log:
  Always compile libgcov and libprofile_rt
  
  I'm not fully grasping the intertwined complexity of how our bootstrap compiler
  is working, so just cut-to-the-chase and build/install both with `_prereq_libs`.

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct 23 01:00:35 2017	(r324890)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct 23 01:42:48 2017	(r324891)
@@ -2261,13 +2261,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 # for world to have runtime coverage instrumentation.
 #
 .if ${MK_COVERAGE} != "no"
-.if ${WANT_COMPILER_TYPE} == "clang" || ${MK_CLANG} != "no"
+# XXX (ngie): make this conditional sometime later
 _coverage_libs+=	lib/libclang_rt/profile
-.endif
-.if ${WANT_COMPILER_TYPE} == "gcc" || ${MK_GCC} != "no"
 _coverage_libs+=	gnu/lib/libgcov
-.endif
-_prereq_libs+=	${_coverage_libs}
+_prereq_libs+=		${_coverage_libs}
 .endif
 
 # These dependencies are not automatically generated: