diff options
author | Simo Fält <simo.falt@qt.io> | 2024-03-08 14:53:27 +0200 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2024-04-25 14:59:46 +0200 |
commit | e6f58ce00064d09b748198c1ddc6b23f54170499 (patch) | |
tree | 3d2a4d949015ab5a27c323f6bb241f9942dacd02 /coin/provisioning/common/unix/install-openssl.sh | |
parent | e34e62b3b27cdce4308140291ddbb65c68c4eea0 (diff) |
Provisioning: Fix openssl lib path on Debian
This amends change Ia4bacf1b7751e15915fc7faca473cb0408a72e35.
Task-number: QTBUG-123049
Pick-to: 6.7
Change-Id: I0a3e24dd8157fd63c1bdfb06019faff2fa5ef3df
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 2ac1bddea454c70fd040c2ac7e3bb3c36035a8cf)
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/provisioning/common/unix/install-openssl.sh')
-rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index e6b2092b..3b3353fb 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -34,8 +34,11 @@ if [[ "$os" == "linux" ]]; then make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\"" - SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib64:$LD_LIBRARY_PATH\"" - + if uname -a |grep -q "Debian"; then + SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\"" + else + SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib64:$LD_LIBRARY_PATH\"" + fi elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then # Below target location has been hard coded into Coin. # QTQAINFRA-1195 |