Skip to content

Commit 683fb3c

Browse files
authored
Merge pull request #404 from MetOffice/402_LD_LIBRARY_PATH_portability_fix
Handle LD_LIBRARY_PATH being unset
2 parents 919cb60 + e305ca9 commit 683fb3c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cset-workflow/bin/app_env_wrapper

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ then
4444
set +u
4545
"${CONDA_PATH}conda" activate "$CONDA_VENV_LOCATION"
4646
set -u
47-
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CONDA_PREFIX/lib"
47+
export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
4848
fi
4949

5050
# Add separately maintained METplus to PATH.
5151
if [[ "$CSET_ENV_SEPARATE_MET" == True ]]
5252
then
5353
echo "Using separate installation of METplus."
54-
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MET_LIBRARIES/lib"
54+
export LD_LIBRARY_PATH="${MET_LIBRARIES}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
5555
export PATH="${METPLUS_BASE}/ush:${MET_BUILD_BASE}/bin:${PATH}"
5656
fi
5757

0 commit comments

Comments
 (0)