diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-01 21:22:05 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-01 21:22:05 +0000 |
| commit | dfa099890c456aed9b7924373d4dc2f013856c04 (patch) | |
| tree | cd861b9d8d01f2b83ede657ac533cd19ee9409a8 /release/tools/vmimage.subr | |
| parent | 648176e095097c5c2642a5627542423e277a5f8e (diff) | |
Notes
Diffstat (limited to 'release/tools/vmimage.subr')
| -rw-r--r-- | release/tools/vmimage.subr | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 6ba7e185a33ff..78e7839d64e4f 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -14,13 +14,10 @@ write_partition_layout() { SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}" fi - _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" - _OBJDIR="$(realpath ${_OBJDIR})" - if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then - BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" - else - BOOTFILES="/${_OBJDIR}/sys/boot" - fi + BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + WITH_UNIFIED_OBJDIR=yes \ + make -C ${WORLDDIR}/sys/boot -V .OBJDIR)" + BOOTFILES="$(realpath ${BOOTFILES})" case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) |