svn commit: r324711 - head/share/mk

[Jonathan Anderson]

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