aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
diff options
context:
space:
mode:
authorMichael Brüning <michael.bruning@qt.io>2024-02-19 16:54:31 +0100
committerMichael Brüning <michael.bruning@qt.io>2024-04-24 09:53:23 +0100
commit92969b10f5e08dbf2ede355b0d0bd3061f50fc8e (patch)
tree6dab0295643471f352219f1ff3462bcc5ab1861e /coin/provisioning/common
parente47468b7d9768213940cd020199721564a74c91f (diff)
Use SetEnvVar instead of appending .bash_profile with LLVM variablesHEADdev
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 <michal.klocek@qt.io> Reviewed-by: Elias Toivola <elias.toivola@qt.io> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-xcoin/provisioning/common/unix/libclang-v100-dyn.sh2
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh2
2 files changed, 2 insertions, 2 deletions
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