Merge pull request #404 from MetOffice/402_LD_LIBRARY_PATH_portabilit…

…y_fix Handle LD_LIBRARY_PATH being unset
MetOffice · Mar 4, 2024 · 683fb3c · 683fb3c
2 parents 919cb60 + e305ca9
commit 683fb3c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cset-workflow/bin/app_env_wrapper b/cset-workflow/bin/app_env_wrapper
@@ -44,14 +44,14 @@ then
   set +u
   "${CONDA_PATH}conda" activate "$CONDA_VENV_LOCATION"
   set -u
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CONDA_PREFIX/lib"
+  export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 fi
 
 # Add separately maintained METplus to PATH.
 if [[ "$CSET_ENV_SEPARATE_MET" == True ]]
 then
   echo "Using separate installation of METplus."
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MET_LIBRARIES/lib"
+  export LD_LIBRARY_PATH="${MET_LIBRARIES}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
   export PATH="${METPLUS_BASE}/ush:${MET_BUILD_BASE}/bin:${PATH}"
 fi