Browse Source

Fixed object paths for cross compiling (#194)

pull/195/head
René Bayer 2 months ago
committed by GitHub
parent
commit
e760f313b7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
  1. +3
    -3
      build/base.sh
  2. +4
    -4
      build/kernel.sh

+ 3
- 3
build/base.sh View File

@ -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}

+ 4
- 4
build/kernel.sh View File

@ -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,

Loading…
Cancel
Save