From owner-svn-src-projects@freebsd.org Thu May 2 14:40:22 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 881FD15976F0 for ; Thu, 2 May 2019 14:40:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B1D391831; Thu, 2 May 2019 14:40:22 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAE14A88B; Thu, 2 May 2019 14:40:21 +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 x42EeLsH010663; Thu, 2 May 2019 14:40:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x42EeLkp010661; Thu, 2 May 2019 14:40:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201905021440.x42EeLkp010661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 2 May 2019 14:40:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r347018 - projects/runtime-coverage-v2/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage-v2/share/mk X-SVN-Commit-Revision: 347018 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2B1D391831 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2019 14:40:22 -0000 Author: ngie Date: Thu May 2 14:40:21 2019 New Revision: 347018 URL: https://svnweb.freebsd.org/changeset/base/347018 Log: Guard against cases where GCNOS would be empty, resulting in failed builds There are some Makefiles that install headers explicitly, without creating programs, e.g., `usr.sbin/amd/include`. In order to support this case moving forward, specifically test for _GCNO_SRCS being non-empty, then set GCNOS appropriately. Modified: projects/runtime-coverage-v2/share/mk/bsd.lib.mk projects/runtime-coverage-v2/share/mk/bsd.prog.mk Modified: projects/runtime-coverage-v2/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage-v2/share/mk/bsd.lib.mk Thu May 2 12:56:13 2019 (r347017) +++ projects/runtime-coverage-v2/share/mk/bsd.lib.mk Thu May 2 14:40:21 2019 (r347018) @@ -517,7 +517,9 @@ _libinstall: .if defined(_COV_FLAG) && !empty(SRCS) _GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} ${SRCS:M*.y} +.if !empty(_GCNO_SRCS) GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g} +.endif .undef _GCNO_SRCS .for _gcno in ${GCNOS} ${_gcno}: ${_gcno:R}.o Modified: projects/runtime-coverage-v2/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage-v2/share/mk/bsd.prog.mk Thu May 2 12:56:13 2019 (r347017) +++ projects/runtime-coverage-v2/share/mk/bsd.prog.mk Thu May 2 14:40:21 2019 (r347018) @@ -330,7 +330,9 @@ NLSNAME?= ${PROG} .include .if defined(_COV_FLAG) && !empty(SRCS) _GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} ${SRCS:M*.y} +.if !empty(_GCNO_SRCS) GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g} +.endif .undef _GCNO_SRCS .for _gcno in ${GCNOS} ${_gcno}: ${_gcno:R}.o