From dbc52b7e48d7f59f74cc36b61d8ec774fcae8e88 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Mar 2024 22:31:48 +0100 Subject: [PATCH] Hack to local build script to use environment if ~/build if present. --- run/environment | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run/environment b/run/environment index aabb463f3..aa4f77187 100644 --- a/run/environment +++ b/run/environment @@ -1,6 +1,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" build=$DIR/../build -export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then + export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH +fi export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib export DCPOMATIC_GRAPHICS=$DIR/../graphics -- 2.30.2