From owner-svn-src-projects@freebsd.org  Mon Oct 23 00:44:20 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
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 2C7DFE3B5E0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 23 Oct 2017 00:44:20 +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 E5E857FE6C;
 Mon, 23 Oct 2017 00:44:19 +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 v9N0iJhe050923;
 Mon, 23 Oct 2017 00:44:19 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N0iJWp050922;
 Mon, 23 Oct 2017 00:44:19 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710230044.v9N0iJWp050922@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 23 Oct 2017 00:44:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r324888 - projects/runtime-coverage
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage
X-SVN-Commit-Revision: 324888
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Oct 2017 00:44:20 -0000

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:
 #