Skip to content

Commit

Permalink
Make bootstrap more robust
Browse files Browse the repository at this point in the history
Change-Id: I67cc22752b34dd49c277e247f0b648047927a02b
Signed-off-by: R. Diez <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8532
Reviewed-by: R. Diez <[email protected]>
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
Reviewed-by: Antonio Borneo <[email protected]>
  • Loading branch information
R. Diez authored and borneoa committed Nov 16, 2024
1 parent 564b24e commit 6d60ac5
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

# Run the autotools bootstrap sequence to create the configure script

# Abort execution on error
set -e
set -e # Abort execution on error.
set -u # Abort if you reference an undefined variable.

if which libtoolize > /dev/null; then
libtoolize="libtoolize"
Expand All @@ -15,13 +15,21 @@ else
exit 1
fi

if [ "$1" = "nosubmodule" ]; then
SKIP_SUBMODULE=1
elif [ -n "$1" ]; then
echo "$0: Illegal argument $1"
echo "USAGE: $0 [nosubmodule]"
exit 1
fi
SKIP_SUBMODULE=0

case "$#" in
0) ;;
1) if [ "$1" = "nosubmodule" ]; then
SKIP_SUBMODULE=1
else
echo "$0: Illegal argument $1" >&2
echo "USAGE: $0 [nosubmodule]" >&2
exit 1
fi;;
*) echo "$0: Wrong number of command-line arguments." >&2
echo "USAGE: $0 [nosubmodule]" >&2
exit 1;;
esac

# bootstrap the autotools
(
Expand All @@ -34,7 +42,7 @@ autoheader --warnings=all
automake --warnings=all --gnu --add-missing --copy
)

if [ -n "$SKIP_SUBMODULE" ]; then
if [ "$SKIP_SUBMODULE" -ne 0 ]; then
echo "Skipping submodule setup"
else
echo "Setting up submodules"
Expand Down

0 comments on commit 6d60ac5

Please sign in to comment.