diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2018-08-07 12:19:06 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-23 09:28:51 +0000 |
commit | 3dd549d61893e085e2eced4a44172b89cad9d47e (patch) | |
tree | c189e1faec22704e8e1b6680e3294d8d8c4aae57 /coin | |
parent | 6c225347aa1a752ead78c4480512cbc6d0f74637 (diff) |
Provisioning: Fix activate of static linking for libclang
Task-number: QTBUG-69793
Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index dd21f424..7caecc96 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -6,6 +6,7 @@ param( . "$PSScriptRoot\helpers.ps1" $libclang_version="6.0" +Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. @@ -13,6 +14,7 @@ $libclang_version="6.0" # Starting from Qt 5.11 QDoc requires Clang to parse C++ $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain +$libclang_version = $libclang_version -replace '["."]' function install() { @@ -23,7 +25,6 @@ function install() { $zip = "c:\users\qt\downloads\libclang.7z" - $libclang_version = $libclang_version -replace '["."]' $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" @@ -72,7 +73,6 @@ if ( $setDefault ) { Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_") } 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 |