summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-05-18 11:55:23 +0200
committerLiang Qi <liang.qi@qt.io>2018-05-18 11:55:23 +0200
commita2b5c37d7ac6e4d986ae51c09f59d7f1cb7dc875 (patch)
tree06210f53645c974c19be2df09d24ca418d17dbc4
parentea52430c6651a3ed9700e71ff8f53d759f1929a0 (diff)
parent081601ba0e368dc99c5dc0333b65584764f43fc9 (diff)
Merge remote-tracking branch 'origin/5.11.0' into 5.11
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh7
-rw-r--r--coin/provisioning/common/windows/libclang.ps16
2 files changed, 13 insertions, 0 deletions
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index f024130f..f6ff4507 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -42,6 +42,7 @@ set -e
# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
BASEDIR=$(dirname "$0")
# shellcheck source=../shared/sw_versions.txt
@@ -70,3 +71,9 @@ sudo mv /tmp/libclang "$destination"
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
echo "libClang = $version" >> ~/versions.txt
+
+if [ "$version" == "6.0" ]; then
+ # This is a hacked static build of libclang which requires special
+ # handling on the qdoc side.
+ SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
+fi
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 5ba0a0aa..db277134 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -86,3 +86,9 @@ if ( $setDefault ) {
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
Write-Output "libClang = $libclang_version" >> ~/versions.txt
+
+if ( $libclang_version -eq "60" ) {
+ # This is a hacked static build of libclang which requires special
+ # handling on the qdoc side.
+ Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
+}