summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-05-14 11:06:05 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-05-14 12:30:59 +0000
commitd75411d6e560fcec1ab36395e88b1baf26c4cb69 (patch)
tree62184a0bd5a32e918812a0756fc5d902dfb44a4f
parentb1b04fcb1aa2f2cd55db258ac30824260485d25a (diff)
Fix linking of qdoc against an external libclang (part 1)
This is the qt5 part of the fix for the task. For the special version of libclang we hacked together that allows static linkage, set an environment variable that the mighty qdoc build system can utilize to activate the release packaging specific linkage. Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9 Task-number: QTBUG-68178 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
-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 53b9dfda..900671e6 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -41,6 +41,7 @@
set -e
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
BASEDIR=$(dirname "$0")
. $BASEDIR/../shared/sw_versions.txt
@@ -68,3 +69,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"
+}