diff --git a/build/base.sh b/build/base.sh index a2f6d52..b614720 100644 --- a/build/base.sh +++ b/build/base.sh @@ -63,12 +63,12 @@ ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildworld ${MAKE_ARGS} NO_CLEAN=yes ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS} # reset the distribution directory -BASE_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR)/${SELF}" -BASE_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR)" +BASE_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR ${MAKE_ARGS})/${SELF}" +BASE_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})" setup_stage "${BASE_OBJDIR}/${BASE_DISTDIR}" # remove older object archives, too -BASE_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR)/base.txz +BASE_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/base.txz rm -f ${BASE_OBJ} ${ENV_FILTER} make -s -C${SRCDIR}/release base.txz ${MAKE_ARGS} diff --git a/build/kernel.sh b/build/kernel.sh index 67663b7..1bd3a69 100644 --- a/build/kernel.sh +++ b/build/kernel.sh @@ -65,13 +65,13 @@ ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCL ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS} # reset the distribution directory -KERNEL_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR)/${SELF}" -KERNEL_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR)" +KERNEL_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR ${MAKE_ARGS})/${SELF}" +KERNEL_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})" setup_stage "${KERNEL_OBJDIR}/${KERNEL_DISTDIR}" # remove older object archives, too -KERNEL_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz -DEBUG_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR)/kernel-dbg.txz +KERNEL_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/kernel.txz +DEBUG_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/kernel-dbg.txz rm -f ${KERNEL_OBJ} ${DEBUG_OBJ} # We used kernel.txz because we did not rewrite it,