Page MenuHomeFreeBSD

D55566.id175067.diff
No OneTemporary

D55566.id175067.diff

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -600,7 +600,8 @@
.endfor
.if defined(DOING_TINDERBOX)
-FAILFILE=${.CURDIR}/_.tinderbox.failed
+TINDERBOX_LOGDIR?= ${.CURDIR}
+FAILFILE=${TINDERBOX_LOGDIR}/_.tinderbox.failed
MAKEFAIL=tee -a ${FAILFILE}
.else
MAKEFAIL=cat
@@ -630,9 +631,9 @@
TOOLS_PREFIX_UNDEF= \
kernel-toolchain \
MK_LLVM_TARGET_ALL=yes \
- > _.${.TARGET} 2>&1 || \
+ > ${TINDERBOX_LOGDIR}/_.${.TARGET} 2>&1 || \
(echo "${.TARGET} failed," \
- "check _.${.TARGET} for details" | \
+ "check ${TINDERBOX_LOGDIR}/_.${.TARGET} for details" | \
${MAKEFAIL}; false)
@if [ ! -e "${HOST_OBJTOP}/tmp/usr/bin/cc" ]; then \
echo "Missing host compiler at ${HOST_OBJTOP}/tmp/usr/bin/cc?" >&2; \
@@ -716,9 +717,9 @@
TARGET=${target} \
TARGET_ARCH=${target_arch} \
${MAKE_PARAMS_${target_arch}} \
- > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
+ > ${TINDERBOX_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
(echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
- "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
+ "check ${TINDERBOX_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
${MAKEFAIL}))
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
.endfor
@@ -775,9 +776,9 @@
TARGET_ARCH=${TARGET_ARCH_${kernel}} \
${MAKE_PARAMS_${TARGET_ARCH_${kernel}}} \
KERNCONF=${kernel} \
- > _.${TARGET}.${kernel} 2>&1 || \
+ > ${TINDERBOX_LOGDIR}/_.${TARGET}.${kernel} 2>&1 || \
(echo "${TARGET} ${kernel} kernel failed," \
- "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
+ "check ${TINDERBOX_LOGDIR}/_.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
@echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel completed on `LC_ALL=C date`"
.endfor
.for target_arch in ${TARGET_ARCHES_${TARGET}}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 3:16 PM (5 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31114696
Default Alt Text
D55566.id175067.diff (1 KB)

Event Timeline