From owner-svn-src-projects@freebsd.org  Mon Oct 23 17:05:37 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 1F324E500BA
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 23 Oct 2017 17:05:37 +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 E1629779AF;
 Mon, 23 Oct 2017 17:05:36 +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 v9NH5aaD057294;
 Mon, 23 Oct 2017 17:05:36 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NH5aE4057293;
 Mon, 23 Oct 2017 17:05:36 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710231705.v9NH5aE4057293@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 17:05:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r324930 - projects/runtime-coverage
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage
X-SVN-Commit-Revision: 324930
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 17:05:37 -0000

Author: ngie
Date: Mon Oct 23 17:05:35 2017
New Revision: 324930
URL: https://svnweb.freebsd.org/changeset/base/324930

Log:
  More trying to quash the stupidity of gcc 4.2.1

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct 23 16:55:22 2017	(r324929)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct 23 17:05:35 2017	(r324930)
@@ -2259,9 +2259,16 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 #
 .if ${MK_COVERAGE} != "no"
 .if ${X_COMPILER_FEATURES:Mc++11}
-_prereq_libs+=	lib/libclang_rt/profile
+_coverage_libs+=	lib/libclang_rt/profile
 .else
-.error "Runtime coverage is only supported with c++11 capable compilers"
+.endif
+.if empty(${_coverage_libs})
+# XXX(ngie): force MK_COVERAGE off since the compiler we're working with (at
+# whatever stage we're at) obviously doesn't support --coverage support per
+# src.opts.mk's minimum requirements.
+MK_COVERAGE:=	no
+.else
+_prereq_libs+=	${_coverage_libs}
 .endif
 .endif