diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-18 11:55:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-18 11:55:23 +0200 |
| commit | a2b5c37d7ac6e4d986ae51c09f59d7f1cb7dc875 (patch) | |
| tree | 06210f53645c974c19be2df09d24ca418d17dbc4 /coin/provisioning/common/windows | |
| parent | ea52430c6651a3ed9700e71ff8f53d759f1929a0 (diff) | |
| parent | 081601ba0e368dc99c5dc0333b65584764f43fc9 (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
Diffstat (limited to 'coin/provisioning/common/windows')
| -rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 6 |
1 files changed, 6 insertions, 0 deletions
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" +} |