From 804108b9e3ff411d4e410f43531bb2ca1aff437b Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 6 Aug 2025 14:24:40 +0200
Subject: [PATCH] Provisioning: Add arm64 libclang for Windows 11 24H2

So it can be used during cross-compilation of arm64 packages.

To ensure the env variable set does not conflict with the x86_64
version, the env variable is suffixed with "arm64".

Pick-to: 6.9
Change-Id: I117f6c4a8431058b9af22390942539a49c632d6a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c3f303b50b3906ebc87b31a5433635268f1ad5f1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 coin/provisioning/common/windows/libclang.ps1               | 6 +++++-
 .../qtci-windows-11_24H2-x86_64/08-libclang.ps1             | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 18f6bdef..7693ed6e 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -1,7 +1,8 @@
 param(
     [string]$archVer="32",
     [string]$toolchain="vs2022",
-    [bool]$setDefault=$true
+    [bool]$setDefault=$true,
+    [bool]$useArchInToolchainSuffix=$false
 )
 . "$PSScriptRoot\helpers.ps1"
 
@@ -71,6 +72,9 @@ if ( $toolchain -eq "llvm-mingw" ) {
     $toolchainSuffix = "llvm_mingw"
 }
 
+if ( $useArchInToolchainSuffix ) {
+    $toolchainSuffix += "_$archVer"
+}
 
 install $sha1 $baseDestination-$archVer
 
diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang.ps1
index de1a108a..d167e399 100644
--- a/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang.ps1
@@ -4,4 +4,5 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
+. "$PSScriptRoot\..\common\windows\libclang.ps1" arm64 vs2022 $False $True
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022