From 9c5e978644c80397710453083c786037db1d0f28 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Wed, 11 Feb 2026 15:46:46 +0100
Subject: [PATCH 1/2] Conditionally package LLVM.dll

This adds a new configuration option to conditionally package LLVM.dll.

The effort to build LLVM as a DLL on Windows is tracked in
swiftlang/swift#85241.
---
 platforms/Windows/Directory.Build.props |  8 ++++++++
 platforms/Windows/bld/bld.wxi           | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 382ce242..3ecc8803 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -28,6 +28,12 @@
   <PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
     <IncludeLegacySDK>true</IncludeLegacySDK>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(IncludeLlvmDll)' == '' ">
+    <IncludeLlvmDll>false</IncludeLlvmDll>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(LlvmVersion)' == '' ">
+    <LlvmVersion>21</LlvmVersion>
+  </PropertyGroup>
 
   <PropertyGroup>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
@@ -92,6 +98,8 @@
       WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
       WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
       IncludeLegacySDK=$(IncludeLegacySDK);
+      IncludeLlvmDll=$(IncludeLlvmDll);
+      LlvmVersion=$(LlvmVersion);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 3c4ecbf2..9a74e8d2 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -193,6 +193,14 @@
       -->
     </ComponentGroup>
 
+    <?if $(IncludeLlvmDll) = True?>
+    <ComponentGroup Id="llvm" Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
+        <File Source="$(ToolchainRoot)\usr\bin\LLVM-$(LlvmVersion).dll" />
+      </Component>
+    </ComponentGroup>
+    <?endif?>
+
     <ComponentGroup Id="lld" Directory="toolchain_$(VariantName)_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
@@ -560,6 +568,9 @@
       <ComponentGroupRef Id="binutils" />
       <ComponentGroupRef Id="lto" />
       <ComponentGroupRef Id="clang" />
+      <?if $(IncludeLlvmDll) = True?>
+      <ComponentGroupRef Id="llvm" />
+      <?endif?>
       <ComponentGroupRef Id="lld" />
       <ComponentGroupRef Id="BlocksRuntime" />
       <ComponentGroupRef Id="libdispatch" />

From 09b77f2898b1150f6de93da6ddf1aa4545535555 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Mon, 30 Mar 2026 17:45:12 -0400
Subject: [PATCH 2/2] Update new variable casing

---
 platforms/Windows/Directory.Build.props | 12 ++++++------
 platforms/Windows/bld/bld.wxi           |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 3ecc8803..6e892f80 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -28,11 +28,11 @@
   <PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
     <IncludeLegacySDK>true</IncludeLegacySDK>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(IncludeLlvmDll)' == '' ">
-    <IncludeLlvmDll>false</IncludeLlvmDll>
+  <PropertyGroup Condition=" '$(IncludeLLVMDLL)' == '' ">
+    <IncludeLLVMDLL>false</IncludeLLVMDLL>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(LlvmVersion)' == '' ">
-    <LlvmVersion>21</LlvmVersion>
+  <PropertyGroup Condition=" '$(LLVMVersion)' == '' ">
+    <LLVMVersion>21</LLVMVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -98,8 +98,8 @@
       WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
       WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
       IncludeLegacySDK=$(IncludeLegacySDK);
-      IncludeLlvmDll=$(IncludeLlvmDll);
-      LlvmVersion=$(LlvmVersion);
+      IncludeLLVMDLL=$(IncludeLLVMDLL);
+      LLVMVersion=$(LLVMVersion);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 9a74e8d2..6253bfc6 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -193,10 +193,10 @@
       -->
     </ComponentGroup>
 
-    <?if $(IncludeLlvmDll) = True?>
+    <?if $(IncludeLLVMDLL) = True?>
     <ComponentGroup Id="llvm" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\LLVM-$(LlvmVersion).dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\LLVM-$(LLVMVersion).dll" />
       </Component>
     </ComponentGroup>
     <?endif?>
@@ -568,7 +568,7 @@
       <ComponentGroupRef Id="binutils" />
       <ComponentGroupRef Id="lto" />
       <ComponentGroupRef Id="clang" />
-      <?if $(IncludeLlvmDll) = True?>
+      <?if $(IncludeLLVMDLL) = True?>
       <ComponentGroupRef Id="llvm" />
       <?endif?>
       <ComponentGroupRef Id="lld" />