Skip to content
Snippets Groups Projects
Commit 4172c8c2 authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/denittis/t24167_pv' into 'master'

pressure-vessel-unruntime: Support PRESSURE_VESSEL_APP_LD_LIBRARY_PATH

See merge request !165
parents 31a3d6ea 73d56251
No related branches found
No related tags found
1 merge request!165pressure-vessel-unruntime: Support PRESSURE_VESSEL_APP_LD_LIBRARY_PATH
Pipeline #5141 passed
......@@ -69,6 +69,10 @@ unset STEAM_RUNTIME
if [ -n "${SYSTEM_LD_LIBRARY_PATH+set}" ]; then
options+=("--env-if-host=SYSTEM_LD_LIBRARY_PATH=$SYSTEM_LD_LIBRARY_PATH")
# This has been superseeded by the new $PRESSURE_VESSEL_APP_LD_LIBRARY_PATH
# environment variable. When we are sure that we are always using the new
# _v2-entry-point with $PRESSURE_VESSEL_APP_LD_LIBRARY_PATH support, the
# following export can be removed
export LD_LIBRARY_PATH="$SYSTEM_LD_LIBRARY_PATH"
fi
......@@ -90,6 +94,13 @@ unset SYSTEM_LD_LIBRARY_PATH
unset SYSTEM_LD_PRELOAD
unset SYSTEM_PATH
if [ -n "${PRESSURE_VESSEL_APP_LD_LIBRARY_PATH+set}" ]; then
options+=("--env-if-host=PRESSURE_VESSEL_APP_LD_LIBRARY_PATH=$PRESSURE_VESSEL_APP_LD_LIBRARY_PATH")
export LD_LIBRARY_PATH="$PRESSURE_VESSEL_APP_LD_LIBRARY_PATH"
fi
unset PRESSURE_VESSEL_APP_LD_LIBRARY_PATH
old_IFS="$IFS"
IFS=":"
for word in $ld_preload; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment