From owner-svn-src-projects@freebsd.org  Mon Sep 11 19:57:05 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 D9C1BE20F0B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 11 Sep 2017 19:57:05 +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 A6552701D3;
 Mon, 11 Sep 2017 19:57:05 +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 v8BJv43E004445;
 Mon, 11 Sep 2017 19:57:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BJv46Z004444;
 Mon, 11 Sep 2017 19:57:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201709111957.v8BJv46Z004444@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, 11 Sep 2017 19:57:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r323460 - projects/runtime-coverage/share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage/share/mk
X-SVN-Commit-Revision: 323460
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, 11 Sep 2017 19:57:06 -0000

Author: ngie
Date: Mon Sep 11 19:57:04 2017
New Revision: 323460
URL: https://svnweb.freebsd.org/changeset/base/323460

Log:
  Chase recent changes to ^/head/share/mk/bsd.lib.mk
  
  Doesn't compile with libexec/rtld-elf when WITH_LIB32 == yes for some
  reason.. but it's a WiP.

Modified:
  projects/runtime-coverage/share/mk/bsd.lib.mk

Modified: projects/runtime-coverage/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.lib.mk	Mon Sep 11 19:07:53 2017	(r323459)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Mon Sep 11 19:57:04 2017	(r323460)
@@ -52,6 +52,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
+_WANTS_DEBUG=
 .else
 STRIP?=	-s
 .endif
@@ -72,10 +73,9 @@ TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 CFLAGS+= ${DEBUG_FILES_CFLAGS}
 CXXFLAGS+= ${DEBUG_FILES_CFLAGS}
 CTFFLAGS+= -g
+_WANTS_DEBUG=
 .endif
-.if defined(SHLIB_NAME) && ${MK_COVERAGE} != "no" && \
-    (!empty(DEBUG_FLAGS:M-g*) || !empty(SHARED_CFLAGS:M-g*) || \
-     !empty(SHARED_CXXFLAGS:M-g*))
+.if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG)
 _COV_FLAG= --coverage
 SHARED_CFLAGS+= ${_COV_FLAG}
 SHARED_CXXFLAGS+= ${_COV_FLAG}
@@ -251,7 +251,7 @@ CLEANFILES+=	${SPOBJS}
 .if defined(SHLIB_NAME)
 _LIBS+=		${SHLIB_NAME}
 
-.if !empty(_COV_FLAG)
+.if defined(_COV_FLAG)
 SOLINKOPTS+=	${_COV_FLAG}
 .endif
 SOLINKOPTS+=	-shared -Wl,-x