svn commit: r331143 - stable/11/stand

[Warner Losh]

Author: imp
Date: Sun Mar 18 19:07:07 2018
New Revision: 331143
URL: https://svnweb.freebsd.org/changeset/base/331143

Log:
  MFC: r331140
  
  Merge ahead of schedule to fix pc98 build issues.

Modified:
  stable/11/stand/defs.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/defs.mk
==============================================================================
--- stable/11/stand/defs.mk	Sun Mar 18 19:05:06 2018	(r331142)
+++ stable/11/stand/defs.mk	Sun Mar 18 19:07:07 2018	(r331143)
@@ -138,6 +138,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}
@@ -147,9 +150,6 @@ _ILINKS+=x86
 .endif
 CLEANFILES+=${_ILINKS}
 
-all: ${PROG}
-
-.if !defined(NO_OBJ)
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}
 
@@ -158,7 +158,7 @@ beforebuild: ${_ILINKS}
 .for _link in ${_ILINKS}
 .if !exists(${.OBJDIR}/${_link})
 ${OBJS}:       ${_link}
-.endif
+.endif # _link exists
 .endfor
 
 .NOPATH: ${_ILINKS}
@@ -177,5 +177,5 @@ ${_ILINKS}:
 	path=`(cd $$path && /bin/pwd)` ; \
 	${ECHO} ${.TARGET:T} "->" $$path ; \
 	ln -fhs $$path ${.TARGET:T}
-.endif
+.endif # !NO_OBJ
 .endif # __BOOT_DEFS_MK__