Skip to content

Commit 574e50a

Browse files
committed
ci: Use CONFIG_SITE variable and --prefix option properly
This change fixes scripts when they are being run locally with a pre- existed `$DEPENDS_DIR/$HOST` directory.
1 parent 1ea0279 commit 574e50a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ci/test/06_script_a.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
export LC_ALL=C.UTF-8
88

9-
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST"
9+
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking"
10+
if [ -z "$NO_DEPENDS" ]; then
11+
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site"
12+
fi
1013
if [ -z "$NO_WERROR" ]; then
1114
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
1215
fi
@@ -23,7 +26,7 @@ if [ -n "$ANDROID_TOOLS_URL" ]; then
2326
exit 0
2427
fi
2528

26-
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
29+
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR"
2730

2831
if [ -n "$CONFIG_SHELL" ]; then
2932
CI_EXEC "$CONFIG_SHELL" -c "./autogen.sh"

0 commit comments

Comments
 (0)