Reset stale configure state for Linux builds
This commit is contained in:
+13
-3
@@ -15,6 +15,17 @@ require_path() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
reset_configure_state() {
|
||||||
|
rm -f config.cache config.log config.status
|
||||||
|
|
||||||
|
# Stale generated makefiles can trigger config.status --recheck with old
|
||||||
|
# configure arguments after a failed build attempt.
|
||||||
|
find . -name Makefile -type f \
|
||||||
|
! -path './depends/*' \
|
||||||
|
! -path './.git/*' \
|
||||||
|
-delete
|
||||||
|
}
|
||||||
|
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
|
|
||||||
case "$MODE" in
|
case "$MODE" in
|
||||||
@@ -23,9 +34,8 @@ case "$MODE" in
|
|||||||
make -C depends HOST="$HOST" NO_QT=1 -j"$JOBS"
|
make -C depends HOST="$HOST" NO_QT=1 -j"$JOBS"
|
||||||
require_path "$BASE_CONFIG"
|
require_path "$BASE_CONFIG"
|
||||||
|
|
||||||
if [[ ! -f configure ]]; then
|
./autogen.sh
|
||||||
./autogen.sh
|
reset_configure_state
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Configuring Linux daemon build..."
|
echo "Configuring Linux daemon build..."
|
||||||
CONFIG_SITE="$BASE_CONFIG" ./configure \
|
CONFIG_SITE="$BASE_CONFIG" ./configure \
|
||||||
|
|||||||
Reference in New Issue
Block a user