From a2ab76186dd9f39cf28aa991320b4b8c7c283c9b Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Sun, 10 Dec 2023 14:46:58 +0000
Subject: [PATCH] bootstrap: fix option propagation with --bootstrap-sync
* top/bootstrap: Ensure options are propagated through
upgrade_bootstrap().
* top/bootstrap-funclib.sh: Likewise.
* build-aux/bootstrap: Auto generated with `make build-aux/bootstrap`.
Fixes https://bugs.gnu.org/67731
---
ChangeLog | 9 +++++++++
build-aux/bootstrap | 4 ++--
top/bootstrap | 2 +-
top/bootstrap-funclib.sh | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 103d66e0d0..4c418233a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-12-10 Pádraig Brady
+
+ bootstrap: fix option propagation with --bootstrap-sync
+ * top/bootstrap: Ensure options are propagated through
+ upgrade_bootstrap().
+ * top/bootstrap-funclib.sh: Likewise.
+ * build-aux/bootstrap: Auto generated with `make build-aux/bootstrap`.
+ Fixes https://bugs.gnu.org/67731
+
2023-12-01 Paul Eggert
frexp, frexpf: pacify clang re address-of-volatile
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 8068d048e6..15705a0e9b 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -760,7 +760,7 @@ autopull()
if $use_gnulib || $bootstrap_sync; then
prepare_GNULIB_SRCDIR
if $bootstrap_sync; then
- upgrade_bootstrap
+ upgrade_bootstrap "$@"
fi
fi
@@ -1475,7 +1475,7 @@ check_build_prerequisites $use_git
if $bootstrap_sync; then
prepare_GNULIB_SRCDIR
- upgrade_bootstrap
+ upgrade_bootstrap "$@"
# Since we have now upgraded if needed, no need to try it a second time below.
bootstrap_sync=false
fi
diff --git a/top/bootstrap b/top/bootstrap
index 74af1b7e59..3c8048d99e 100755
--- a/top/bootstrap
+++ b/top/bootstrap
@@ -188,7 +188,7 @@ check_build_prerequisites $use_git
if $bootstrap_sync; then
prepare_GNULIB_SRCDIR
- upgrade_bootstrap
+ upgrade_bootstrap "$@"
# Since we have now upgraded if needed, no need to try it a second time below.
bootstrap_sync=false
fi
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 325ca7ed39..3154af0dd4 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -723,7 +723,7 @@ autopull()
if $use_gnulib || $bootstrap_sync; then
prepare_GNULIB_SRCDIR
if $bootstrap_sync; then
- upgrade_bootstrap
+ upgrade_bootstrap "$@"
fi
fi
--
2.39.5