diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-10 19:13:20 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-10 19:13:20 +0000 |
| commit | 574e50addf8c65a3a9e0f2d8e933c147d1e93932 (patch) | |
| tree | 25ac7c954fb07bc18879f994724d975b6bcc6fe1 /ci | |
| parent | 1ea02791f3d81c7716d9ea455971203f74d7a107 (diff) | |
| download | bitcoin-574e50addf8c65a3a9e0f2d8e933c147d1e93932.tar.xz | |
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.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/06_script_a.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index 13693a2ecf..573d50678a 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -6,7 +6,10 @@ export LC_ALL=C.UTF-8 -BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST" +BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking" +if [ -z "$NO_DEPENDS" ]; then + BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site" +fi if [ -z "$NO_WERROR" ]; then BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror" fi @@ -23,7 +26,7 @@ if [ -n "$ANDROID_TOOLS_URL" ]; then exit 0 fi -BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib" +BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR" if [ -n "$CONFIG_SHELL" ]; then CI_EXEC "$CONFIG_SHELL" -c "./autogen.sh" |