From owner-svn-src-head@freebsd.org  Wed Oct 18 00:30:16 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 ED8F3E4B9F1;
 Wed, 18 Oct 2017 00:30:16 +0000 (UTC)
 (envelope-from jonathan@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 BB99663C1B;
 Wed, 18 Oct 2017 00:30:16 +0000 (UTC)
 (envelope-from jonathan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9I0UFVj026165;
 Wed, 18 Oct 2017 00:30:15 GMT (envelope-from jonathan@FreeBSD.org)
Received: (from jonathan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9I0UF5g026164;
 Wed, 18 Oct 2017 00:30:15 GMT (envelope-from jonathan@FreeBSD.org)
Message-Id: <201710180030.v9I0UF5g026164@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jonathan set sender to
 jonathan@FreeBSD.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Wed, 18 Oct 2017 00:30:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324711 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: jonathan
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 324711
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Oct 2017 00:30:17 -0000

Author: jonathan
Date: Wed Oct 18 00:30:15 2017
New Revision: 324711
URL: https://svnweb.freebsd.org/changeset/base/324711

Log:
  Improve logic of CLEANFILES+=${PROG_FULL}.{bc,ll}.
  
  The build rule describing how to create ${PROG_FULL}.{bc,ll} is only
  dependent on LLVM_LINK being defined, not on MK_DEBUG_FILES being "yes".
  Move the addition of ${PROG_FULL}.{bc,ll} out of the conditional block
  under `.if ${MK_DEBUG_FILES} != "no"` and up next to where the build
  rules for ${PROG_FULL}.{bc,ll} are defined.
  
  Reviewed by:	emaste
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D12703

Modified:
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Wed Oct 18 00:18:03 2017	(r324710)
+++ head/share/mk/bsd.prog.mk	Wed Oct 18 00:30:15 2017	(r324711)
@@ -158,6 +158,7 @@ ${PROG_FULL}.bc: ${BCOBJS}
 ${PROG_FULL}.ll: ${LLOBJS}
 	${LLVM_LINK} -S -o ${.TARGET} ${LLOBJS}
 
+CLEANFILES+=	${PROG_FULL}.bc ${PROG_FULL}.ll
 .endif # defined(LLVM_LINK)
 
 .if	${MK_MAN} != "no" && !defined(MAN) && \
@@ -181,7 +182,7 @@ all: all-man
 .if defined(PROG)
 CLEANFILES+= ${PROG} ${PROG}.bc ${PROG}.ll
 .if ${MK_DEBUG_FILES} != "no"
-CLEANFILES+= ${PROG_FULL} ${PROG_FULL}.bc ${PROGNAME}.debug ${PROG_FULL}.ll
+CLEANFILES+= ${PROG_FULL} ${PROGNAME}.debug
 .endif
 .endif