aboutsummaryrefslogtreecommitdiff
path: root/release/scripts/mm-mtree.sh
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/mm-mtree.sh')
-rwxr-xr-xrelease/scripts/mm-mtree.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index 620ab6dd962c..644f72ebb920 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -81,11 +81,6 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
fi
# Setup make to use system files from SOURCEDIR
-objp=${MAKEOBJDIRPREFIX}
-[ -z "${objp}" ] && objp=/usr/obj
-legacydir=${objp}${SOURCEDIR}/tmp/legacy
-legacypath=${legacydir}/usr/sbin:${legacydir}/usr/bin:${legacydir}/bin
-MM_MAKE_ARGS="${MM_MAKE_ARGS} PATH=${legacypath}:${PATH}"
MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk"
delete_temproot () {
@@ -121,6 +116,9 @@ echo ''
esac
od=${TEMPROOT}/usr/obj
${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
+ MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \
+ MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \
+ MK_CDDL=no MK_TESTS=no MK_RESCUE=no &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||