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>
This commit is contained in:
Simon Hausmann
2018-05-14 11:06:05 +02:00
parent b1b04fcb1a
commit d75411d6e5
2 changed files with 13 additions and 0 deletions

View File

@@ -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

View File

@@ -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"
}