From 7fbb1c2aecce6827f4bfdf5c96c7038ef2d0518f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 24 Sep 2024 23:53:24 +0300 Subject: [PATCH] Provisioning: Add libclang for Windows on ARM Libclang is needed for QDoc. Adding support for WoA (arch=arm64) also introduced a need to change archVer parameter from Integer to a string. Task-number: QTBUG-129256 Change-Id: I13f15925a7639c6f926c564146fbbc88f73fff8f Reviewed-by: Paul Wicking (cherry picked from commit 1fe16f55f02a0d1378f1b54b22462910ae099cd7) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/libclang.ps1 | 21 +++++++++++++++---- .../08-libclang.ps1 | 2 ++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 103d7cdd..615c496b 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,5 +1,5 @@ param( - [Int32]$archVer=32, + [string]$archVer="32", [string]$toolchain="vs2019", [bool]$setDefault=$true ) @@ -36,8 +36,21 @@ function install() { $toolchainSuffix = "" +if ( $toolchain -eq "vs2022" ) { + if ( $archVer -eq "64" ) { + $sha1 = "7e51f0eabdfe8eea17aaf1dce7b2ffe1ea064f66" + } + elseif ( $archVer -eq "arm64" ) { + $sha1 = "986d4d0f253de505ef499345238c101dac1ca3a6" + } + else { + $sha1 = "" + } + $toolchainSuffix = "msvc" +} + if ( $toolchain -eq "vs2019" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f" } else { @@ -47,7 +60,7 @@ if ( $toolchain -eq "vs2019" ) { } if ( $toolchain -eq "mingw" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3" } else { @@ -58,7 +71,7 @@ if ( $toolchain -eq "mingw" ) { if ( $toolchain -eq "llvm-mingw" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58" } else { diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 new file mode 100644 index 00000000..516adaf0 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 @@ -0,0 +1,2 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" arm64 vs2022