From 92969b10f5e08dbf2ede355b0d0bd3061f50fc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Mon, 19 Feb 2024 16:54:31 +0100 Subject: Use SetEnvVar instead of appending .bash_profile with LLVM variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that the existence of .bash_profile on Debian systems prevents the .profile file from being read on login, which means some additions to PATH that are essential for e.g. the Web Engine build are not made. Pick-to: 6.7 6.6 6.5 Change-Id: Ib271ef49e573fc0588ffbaa9bebbfda4469b60f9 Reviewed-by: Michal Klocek Reviewed-by: Elias Toivola Reviewed-by: Piotr Wierciński Reviewed-by: Simo Fält --- coin/provisioning/common/unix/libclang-v100-dyn.sh | 2 +- coin/provisioning/common/unix/libclang.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/unix/libclang-v100-dyn.sh b/coin/provisioning/common/unix/libclang-v100-dyn.sh index f73903c7..14194f55 100755 --- a/coin/provisioning/common/unix/libclang-v100-dyn.sh +++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh @@ -48,5 +48,5 @@ sudo mv /usr/local/libclang "$destination" rm -rf $zip -echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile +SetEnvVar "LLVM_DYNAMIC_LIBS_100" "$destination" echo "libClang for QtForPython= $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 9a442d2e..5f75d7e4 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -62,5 +62,5 @@ sudo mv /usr/local/libclang "$destination" rm -rf $zip -echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile +SetEnvVar "LLVM_INSTALL_DIR" "$destination" echo "libClang = $version" >> ~/versions.txt -- cgit v1.2.3