svn commit: r364645 - head

Alex Richardson arichardson at FreeBSD.org
Mon Aug 24 09:20:14 UTC 2020


Author: arichardson
Date: Mon Aug 24 09:20:13 2020
New Revision: 364645
URL: https://svnweb.freebsd.org/changeset/base/364645

Log:
  Pass the installworld install(1) flags to make buildenv
  
  This ensure that running make install inside buildenv correctly includes
  the METALOG flags when building with -DNO_ROOT.
  
  Reviewed By:	brooks
  Differential Revision: https://reviews.freebsd.org/D26038

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Aug 24 09:19:05 2020	(r364644)
+++ head/Makefile.inc1	Mon Aug 24 09:20:13 2020	(r364645)
@@ -1178,7 +1178,9 @@ buildenv: .PHONY
 .if ${BUILDENV_SHELL:M*zsh*}
 	@echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE}
 .endif
-	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL}
+	@cd ${BUILDENV_DIR} && env ${WMAKEENV} \
+	INSTALL="${INSTALL_CMD} ${INSTALLFLAGS}" \
+	MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" BUILDENV=1 ${BUILDENV_SHELL}
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS} .PHONY


More information about the svn-src-all mailing list