diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-03-28 13:17:52 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-28 20:04:24 +0200 |
| commit | fa908a41f3b86622e4635b3478467e19fa67b571 (patch) | |
| tree | 63679b0357d7d35eca50d028bdb8d55165c894ac /ci | |
| parent | 19e3e654293858141f39eef8fdae0badd224090f (diff) | |
| download | bitcoin-fa908a41f3b86622e4635b3478467e19fa67b571.tar.xz | |
ci: Set DEPENDS_DIR when setting BASE_ROOT_DIR
The depends dir can not be overwritten by a FILE_ENV file. Also, a FILE_ENV file
might depend on the DEPENDS_DIR value. Thus, set it before reading FILE_ENV.
This commit does not change behavior, but is required for later commits.
Can be reviewed with --color-moved=dimmed-zebra
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/00_setup_env.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 87cf8538f6..e6aec723bc 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -11,6 +11,9 @@ export LC_ALL=C.UTF-8 # This is where the depends build is done. BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd ) export BASE_ROOT_DIR +# The depends dir. +# This folder exists on the ci host and ci guest. Changes are propagated back and forth. +export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends} echo "Setting specific values in env" if [ -n "${FILE_ENV}" ]; then @@ -56,9 +59,6 @@ export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1} # The cache dir. # This folder exists on the ci host and ci guest. Changes are propagated back and forth. export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache} -# The depends dir. -# This folder exists on the ci host and ci guest. Changes are propagated back and forth. -export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends} # Folder where the build result is put (bin and lib). export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST} # Folder where the build is done (dist and out-of-tree build). |