From dd929bcb997454ce32b5b3e834e29b7ac6e2cac7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Tue, 3 Feb 2015 03:55:48 +0000 Subject: [PATCH] bootstrap: exit immediately upon gnulib-tool failure * build-aux/bootstrap: Exit immediately if gnulib-tool fails. This was noticed when gnulib-tool exited early due to failure to apply a patch in coreutils at http://hydra.nixos.org/eval/1172233, but various confusing errors were then given as the build proceeded. --- ChangeLog | 8 ++++++++ build-aux/bootstrap | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7fdb00a6f4..103fd49635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-02-03 Pádraig Brady + + bootstrap: exit immediately upon gnulib-tool failure + * build-aux/bootstrap: Exit immediately if gnulib-tool fails. + This was noticed when gnulib-tool exited early due to failure + to apply a patch in coreutils at http://hydra.nixos.org/eval/1172233, + but various confusing errors were then given as the build proceeded. + 2015-02-02 Andreas Gruenbacher symlinkat: include all required header files diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 2fdf267473..e72894c15c 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -915,7 +915,8 @@ if test $use_libtool = 1; then esac fi echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ -- 2.39.5