Skip to content

Commit 64150c6

Browse files
WebKit ARM64 Builderclaude
andcommitted
Fix /MT flags and LLVM ARM64 installer hanging
- Remove /MT and /MTd from CMAKE_C/CXX_FLAGS (runtime library is controlled by CMAKE_MSVC_RUNTIME_LIBRARY) - Extract LLVM ARM64 with 7zip instead of running installer which hangs forever in CI 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 5ffc3aa commit 64150c6

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,15 @@ jobs:
326326
scoop install perl
327327
scoop install make
328328
329-
# LLVM ARM64 has pre_install script issues in Scoop, install manually
330-
Write-Host "Installing LLVM ARM64 manually..."
329+
# LLVM ARM64: Download and extract manually instead of using installer
330+
Write-Host "Downloading LLVM ARM64..."
331331
$llvmUrl = "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.4/LLVM-19.1.4-woa64.exe"
332-
$llvmExe = "$env:TEMP\llvm-installer.exe"
332+
$llvmExe = "$env:TEMP\llvm.exe"
333333
Invoke-WebRequest -Uri $llvmUrl -OutFile $llvmExe
334-
Start-Process -FilePath $llvmExe -ArgumentList "/S", "/D=C:\LLVM" -Wait
334+
335+
# Extract using 7zip instead of running installer (which hangs)
336+
Write-Host "Extracting LLVM ARM64..."
337+
& "C:\Program Files\7-Zip\7z.exe" x $llvmExe -o"C:\LLVM" -y
335338
echo "C:\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
336339
} else {
337340
# Use x64 packages

windows-release.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ cmake -S . -B $WebKitBuild `
292292
"-DRuby_EXECUTABLE=${RubyPath}" `
293293
"-DCMAKE_C_COMPILER=clang-cl" `
294294
"-DCMAKE_CXX_COMPILER=clang-cl" `
295-
"-DCMAKE_C_FLAGS_RELEASE=/Zi /O2 /Ob2 /DNDEBUG /MT -clang:-fno-asynchronous-unwind-tables " `
296-
"-DCMAKE_CXX_FLAGS_RELEASE=/Zi /O2 /Ob2 /DNDEBUG /MT -Xclang -fno-c++-static-destructors -clang:-fno-asynchronous-unwind-tables " `
297-
"-DCMAKE_C_FLAGS_DEBUG=/Zi /FS /O0 /Ob0 /MTd " `
298-
"-DCMAKE_CXX_FLAGS_DEBUG=/Zi /FS /O0 /Ob0 /MTd -Xclang -fno-c++-static-destructors " `
295+
"-DCMAKE_C_FLAGS_RELEASE=/Zi /O2 /Ob2 /DNDEBUG -clang:-fno-asynchronous-unwind-tables " `
296+
"-DCMAKE_CXX_FLAGS_RELEASE=/Zi /O2 /Ob2 /DNDEBUG -Xclang -fno-c++-static-destructors -clang:-fno-asynchronous-unwind-tables " `
297+
"-DCMAKE_C_FLAGS_DEBUG=/Zi /FS /O0 /Ob0 " `
298+
"-DCMAKE_CXX_FLAGS_DEBUG=/Zi /FS /O0 /Ob0 -Xclang -fno-c++-static-destructors " `
299299
-DENABLE_REMOTE_INSPECTOR=ON `
300300
"-DCMAKE_MSVC_RUNTIME_LIBRARY=${CmakeMsvcRuntimeLibrary}" `
301301
@VcpkgToolchain `

0 commit comments

Comments
 (0)