svn commit: r336741 - stable/11/release/tools

[Glen Barber]

Author: gjb
Date: Thu Jul 26 16:08:34 2018
New Revision: 336741
URL: https://svnweb.freebsd.org/changeset/base/336741

Log:
  Following r336726, explicitly invoke the 'obj' target when
  setting BOOTFILES.  On stable/11, without this change, the
  .OBJDIR expands to /usr/src/stand instead /usr/obj/<foo>.
  
  This is a piece of duct tape for now until I figure out why
  the correct directory is not being located.
  
  This is a direct commit to stable/11.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/tools/arm.subr

Modified: stable/11/release/tools/arm.subr
==============================================================================
--- stable/11/release/tools/arm.subr	Thu Jul 26 16:08:26 2018	(r336740)
+++ stable/11/release/tools/arm.subr	Thu Jul 26 16:08:34 2018	(r336741)
@@ -142,6 +142,10 @@ arm_install_boot() {
 		${FATMOUNT}/ubldr.bin
 	fi
 
+	# Ensure the correct .OBJDIR exists.
+	chroot ${CHROOTDIR} env TARGET=${EMBEDDED_TARGET} \
+		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} WITH_UNIFIED_OBJDIR=yes \
+		make -C ${WORLDDIR}/stand obj
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 		env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 		WITH_UNIFIED_OBJDIR=yes \