From 52965a6f925206a1505950279dcfa91123331714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Thu, 6 Jun 2024 18:27:02 +0200 Subject: [PATCH] [Windows] Remove LLVM standalone installation LLVM is already included in the Visual Studio installation. This duplication creates conflicts between versions. The current MSVC C++ standard library requires at least Clang 17, while the standalone LLVM is 16. There is no reason to include two different LLVM versions. Use the one from the Visual Studio installation. Should anyone need standalone LLVM, they can install it with a single command: `choco install llvm`. Fixes: #10001 --- images/windows/Windows2019-Readme.md | 1 - images/windows/Windows2022-Readme.md | 1 - images/windows/scripts/build/Install-LLVM.ps1 | 10 ---------- images/windows/templates/windows-2019.pkr.hcl | 3 +-- images/windows/templates/windows-2022.pkr.hcl | 3 +-- 5 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 images/windows/scripts/build/Install-LLVM.ps1 diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index dda9e8d72165..17a447b044f4 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -16,7 +16,6 @@ - Go 1.21.10 - Julia 1.10.3 - Kotlin 2.0.0 -- LLVM 16.0.6 - Node 18.20.3 - Perl 5.32.1 - PHP 8.3.7 diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e9bcd287821a..fc90bdc3d3b1 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -17,7 +17,6 @@ - Go 1.21.10 - Julia 1.10.3 - Kotlin 1.9.24 -- LLVM 16.0.6 - Node 18.20.2 - Perl 5.32.1 - PHP 8.3.7 diff --git a/images/windows/scripts/build/Install-LLVM.ps1 b/images/windows/scripts/build/Install-LLVM.ps1 deleted file mode 100644 index 41b8aef95184..000000000000 --- a/images/windows/scripts/build/Install-LLVM.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -## File: Install-LLVM.ps1 -## Desc: Install the latest stable version of llvm and clang compilers -################################################################################ - -$llvmVersion = (Get-ToolsetContent).llvm.version -$latestChocoVersion = Resolve-ChocoPackageVersion -PackageName "llvm" -TargetVersion $llvmVersion -Install-ChocoPackage llvm -ArgumentList '--version', $latestChocoVersion - -Invoke-PesterTests -TestFile "LLVM" diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 9c734d633f8f..a7ed32c8dbfb 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -389,8 +389,7 @@ build { "${path.root}/../scripts/build/Configure-DynamicPort.ps1", "${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", "${path.root}/../scripts/build/Configure-Shell.ps1", - "${path.root}/../scripts/build/Configure-DeveloperMode.ps1", - "${path.root}/../scripts/build/Install-LLVM.ps1" + "${path.root}/../scripts/build/Configure-DeveloperMode.ps1" ] } diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 2fb94ea72874..aec2079182c9 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -390,8 +390,7 @@ build { "${path.root}/../scripts/build/Configure-DynamicPort.ps1", "${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", "${path.root}/../scripts/build/Configure-Shell.ps1", - "${path.root}/../scripts/build/Configure-DeveloperMode.ps1", - "${path.root}/../scripts/build/Install-LLVM.ps1" + "${path.root}/../scripts/build/Configure-DeveloperMode.ps1" ] }