Skip to content

Commit

Permalink
[Windows] Remove LLVM standalone installation
Browse files Browse the repository at this point in the history
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: actions#10001
  • Loading branch information
kasper93 committed Jun 6, 2024
1 parent bbad000 commit 52965a6
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 16 deletions.
1 change: 0 additions & 1 deletion images/windows/Windows2019-Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion images/windows/Windows2022-Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions images/windows/scripts/build/Install-LLVM.ps1

This file was deleted.

3 changes: 1 addition & 2 deletions images/windows/templates/windows-2019.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/windows/templates/windows-2022.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down

0 comments on commit 52965a6

Please sign in to comment.