summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-25 00:12:38 +0000
committerKarl Berry <karl@freefriends.org>2008-03-25 00:12:38 +0000
commite6dde83022737f6d6386f9da7ec134da932012c7 (patch)
treee134381226253d04155cde7d6f73a61cc28e6e9e
parent22da51987dc6b39f278b604ebffe7debfb8abdd8 (diff)
another attempt at exiting with appropriate status.
git-svn-id: svn://tug.org/texlive/trunk@7136 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/Build12
1 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/Build b/Build/source/Build
index f870471d90a..674f15dea38 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -65,10 +65,11 @@ export GNUMAKE
# build, so omit the warning about it.
: ${KPATHSEA_WARNING=0}
+# set -vx
+
# configure && make. Keep the tee outside, so that we can detect
# failure at either step.
{
- set -x; \
eval $TL_BUILD_ENV time $TL_CONFIGURE \
--prefix=$TL_INSTALL_DEST \
--datadir=$TL_INSTALL_DEST \
@@ -76,7 +77,10 @@ export GNUMAKE
$TL_CONFIGURE_ARGS \
"$@" \
&& eval $TL_BUILD_ENV time $TL_MAKE $TL_TARGET
- exitstatus=$?
+
+ # Too arcane to try to propagate the exit status through a pipeline.
+ # Just use a temp file.
+ echo $? >exitstatus.txt
} 2>&1 | tee build.log
@@ -89,6 +93,6 @@ if test "$count" -gt 0; then
else
echo "$0: Build failed, no binaries under $bindir."
exit 1
-fi
+fi | tee -a build.log
-exit $exitstatus
+exit `cat exitstatus.txt`