Use the cached Windows linker directly

Author: JohnHeikens

metadata/LLVM_MINGW_TOOLCHAIN

@@ -4,4 +4,4 @@ llvm 22
 crt ucrt
 x64_sha256 b9b68a4d276e16fa25802aaba458e4638f64b3884c290aaccdc2d87083b6ca35
 arm64_sha256 312593669435bd0bfc1a43ac3fba23c8b27e0610bade88b2738e5a01702a99ba
-schema 3
+schema 2

scripts/llvm-mingw-toolchain.ps1

@@ -40,7 +40,7 @@ function Read-LlvmMingwMetadata {
     if ($metadata.release -notmatch '^[0-9]{8}$' -or $metadata.llvm -notmatch '^[0-9]+$') {
         throw "LLVM MinGW release and LLVM version fields are invalid."
     }
-    if ($metadata.crt -ne "ucrt" -or $metadata.schema -ne "3") {
+    if ($metadata.crt -ne "ucrt" -or $metadata.schema -ne "2") {
         throw "LLVM MinGW CRT or metadata schema is unsupported."
     }
     foreach ($checksumField in "x64_sha256", "arm64_sha256") {
@@ -102,8 +102,6 @@ function Assert-LlvmMingwLayout {
         "LICENSE.TXT",
         "bin\cc.exe",
         "bin\clang-$LlvmVersion.exe",
-        "bin\mingw32-common.cfg",
-        "bin\$TargetArchitecture-w64-windows-gnu.cfg",
         "bin\llvm-ar.exe",
         "bin\ld.lld.exe",
         "bin\libLLVM-$LlvmVersion.dll",
@@ -144,24 +142,27 @@ function Install-LlvmMingwToolchain {
     $archivePath = Join-Path $archiveDirectory $assetName
     $toolchainRoot = Join-Path $cacheRoot "$($metadata.release)-$($metadata.crt)-$($hostConfiguration.AssetArchitecture)"
     $markerPath = Join-Path $toolchainRoot ".dynlex-llvm-mingw"
-    $markerFields = @(
+    $markerContents = @(
+        "schema=$($metadata.schema)",
         "release=$($metadata.release)",
         "sha256=$expectedChecksum",
         "host=$($hostConfiguration.AssetArchitecture)",
         "target=$($hostConfiguration.TargetTriple)"
-    )
-    $markerContents = (@("schema=$($metadata.schema)") + $markerFields) -join "`n"
-    $previousMarkerContents = @(
-        (@("schema=1") + $markerFields) -join "`n"
-        (@("schema=2") + $markerFields) -join "`n"
-    )
+    ) -join "`n"
+    $schemaOneMarkerContents = @(
+        "schema=1",
+        "release=$($metadata.release)",
+        "sha256=$expectedChecksum",
+        "host=$($hostConfiguration.AssetArchitecture)",
+        "target=$($hostConfiguration.TargetTriple)"
+    ) -join "`n"
 
     if (Test-Path $toolchainRoot) {
         if (-not (Test-Path -PathType Leaf $markerPath)) {
             throw "LLVM MinGW cache directory exists without its integrity marker: $toolchainRoot"
         }
         $actualMarkerContents = (Get-Content $markerPath -Raw).TrimEnd()
-        if ($previousMarkerContents -contains $actualMarkerContents) {
+        if ($actualMarkerContents -eq $schemaOneMarkerContents) {
             Remove-Item -Recurse -Force $toolchainRoot
         } elseif ($actualMarkerContents -ne $markerContents) {
             throw "LLVM MinGW cache integrity marker does not match the pinned toolchain."
@@ -209,8 +210,6 @@ function Install-LlvmMingwToolchain {
             foreach ($fileName in @(
                 "cc.exe",
                 "clang-$($metadata.llvm).exe",
-                "mingw32-common.cfg",
-                "$($hostConfiguration.TargetArchitecture)-w64-windows-gnu.cfg",
                 "llvm-ar.exe",
                 "ld.lld.exe",
                 "libLLVM-$($metadata.llvm).dll",

scripts/stage-windows-toolchain.ps1

@@ -47,8 +47,6 @@ New-Item -ItemType Directory -Path $destinationRuntime, $destinationVcpkgLicense
 foreach ($fileName in @(
     "cc.exe",
     "clang-$LlvmVersion.exe",
-    "mingw32-common.cfg",
-    "$TargetArchitecture-w64-windows-gnu.cfg",
     "ld.lld.exe",
     "libLLVM-$LlvmVersion.dll",
     "libclang-cpp.dll",

scripts/test_windows_toolchain.ps1

@@ -129,7 +129,7 @@ $llvmMingwMetadata = Read-LlvmMingwMetadata -ProjectRoot $projectRoot
 if (
     $llvmMingwMetadata.release -ne "20260616" -or
     $llvmMingwMetadata.llvm -ne "22" -or
-    $llvmMingwMetadata.schema -ne "3" -or
+    $llvmMingwMetadata.schema -ne "2" -or
     $llvmMingwMetadata.x64_sha256 -ne "b9b68a4d276e16fa25802aaba458e4638f64b3884c290aaccdc2d87083b6ca35" -or
     $llvmMingwMetadata.arm64_sha256 -ne "312593669435bd0bfc1a43ac3fba23c8b27e0610bade88b2738e5a01702a99ba"
 ) {
@@ -169,8 +169,6 @@ try {
         "LICENSE.TXT",
         "bin\cc.exe",
         "bin\clang-22.exe",
-        "bin\mingw32-common.cfg",
-        "bin\x86_64-w64-windows-gnu.cfg",
         "bin\llvm-ar.exe",
         "bin\ld.lld.exe",
         "bin\libLLVM-22.dll",
@@ -215,8 +213,6 @@ try {
         -DependencyRoot $dependencyRoot
     foreach ($relativePath in @(
         "lib\dynlex\toolchain\bin\cc.exe",
-        "lib\dynlex\toolchain\bin\mingw32-common.cfg",
-        "lib\dynlex\toolchain\bin\x86_64-w64-windows-gnu.cfg",
         "lib\dynlex\toolchain\lib\clang\22\include\stdbool.h",
         "lib\dynlex\toolchain\lib\clang\22\include\stddef.h",
         "lib\dynlex\toolchain\lib\clang\22\include\x86intrin.h",

src/cpp/compiler/codegen/native.cpp

@@ -497,6 +497,10 @@ bool emitNativeExecutable(ParseContext &context) {
 	commandStorage.push_back(linkerProgram);
 #ifdef _WIN32
 	commandStorage.push_back("--target=" DYNLEX_WINDOWS_TARGET_TRIPLE);
+	commandStorage.push_back("-rtlib=compiler-rt");
+	commandStorage.push_back("-unwindlib=libunwind");
+	commandStorage.push_back("-stdlib=libc++");
+	commandStorage.push_back("-fuse-ld=lld");
 	commandStorage.push_back("-L" + toolchain.targetLibraries.string());
 	commandStorage.push_back("-L" + toolchain.dependencyLibraries.string());
 #elif defined(__APPLE__)