svn commit: r331140 - head/stand

[Warner Losh]

Author: imp
Date: Sun Mar 18 18:50:48 2018
New Revision: 331140
URL: https://svnweb.freebsd.org/changeset/base/331140

Log:
  Don't add links or cleanfiles for NO_OBJ case, in addition to not
  creating them. Move them under the if after the all: target.  They are
  just defines, so it doesn't really matter where we have them.
  
  MFC After: 3 days

Modified:
  head/stand/defs.mk

Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk	Sun Mar 18 18:37:47 2018	(r331139)
+++ head/stand/defs.mk	Sun Mar 18 18:50:48 2018	(r331140)
@@ -152,6 +152,9 @@ CFLAGS+=	-mlittle-endian
 # Make sure we use the machine link we're about to create
 CFLAGS+=-I.
 
+all: ${PROG}
+
+.if !defined(NO_OBJ)
 _ILINKS=machine
 .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
 _ILINKS+=${MACHINE_CPUARCH}
@@ -161,9 +164,6 @@ _ILINKS+=x86
 .endif
 CLEANFILES+=${_ILINKS}
 
-all: ${PROG}
-
-.if !defined(NO_OBJ)
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}
 
@@ -172,7 +172,7 @@ beforebuild: ${_ILINKS}
 .for _link in ${_ILINKS}
 .if !exists(${.OBJDIR}/${_link})
 ${OBJS}:       ${_link}
-.endif
+.endif # _link exists
 .endfor
 
 .NOPATH: ${_ILINKS}
@@ -191,5 +191,5 @@ ${_ILINKS}:
 	path=`(cd $$path && /bin/pwd)` ; \
 	${ECHO} ${.TARGET:T} "->" $$path ; \
 	ln -fhs $$path ${.TARGET:T}
-.endif
+.endif # !NO_OBJ
 .endif # __BOOT_DEFS_MK__