commit 796c64c07ac8f7cdf6a6f7a28aeaf0a82540d1f4
author Jan Kundrát <jan.kundrat@cesnet.cz> Sat May 26 18:49:11 2018 +0200
committer Jan Kundrát <jan.kundrat@cesnet.cz> Sat May 26 18:49:47 2018 +0200
tree d2fd55d541ea3b48f6dee148f685e3b7c512c046
parent 763db1e73595969021e7a76e646adc4938513e16

CI: Fix path mangling

Change-Id: I556fc368cb1eeb7b002389fa936a79c7628dd600
See-also: I5d9c3a3507d4165602e9d1fc3c752acb2273b3c4

ci/do-build.sh

diff --git a/ci/do-build.sh b/ci/do-build.sh
index 891ebef..a7177ac 100755
--- a/ci/do-build.sh
+++ b/ci/do-build.sh
@@ -8,8 +8,8 @@
 PREFIX=~/target
 mkdir ${PREFIX}
 export PATH=${PREFIX}/bin:$PATH
-export LD_LIBRARY_PATH=${PREFIX}/lib64:${PREFIX}/lib
-export PKG_CONFIG_PATH=${PREFIX}/lib64/pkgconfig:${PREFIX}/lib/pkgconfig
+export LD_LIBRARY_PATH=${PREFIX}/lib64:${PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export PKG_CONFIG_PATH=${PREFIX}/lib64/pkgconfig:${PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
 
 if [[ $TH_JOB_NAME =~ .*-sanitizers-.* ]]; then
     # https://gitlab.kitware.com/cmake/cmake/issues/16609