From 0f31fdf253305eb522bd003431f7a996b997efa3 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 24 Aug 2020 09:20:13 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 77056c305ae5..d50bfd772d27 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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