Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 4a4415538208315269bc5642d489945ed85df924
https://github.com/WebKit/WebKit/commit/4a4415538208315269bc5642d489945ed85df924
Author: Pascoe <[email protected]>
Date: 2026-06-06 (Sat, 06 Jun 2026)
Changed paths:
M Source/JavaScriptCore/shell/CMakeLists.txt
M Source/ThirdParty/libwebrtc/CMakeLists.txt
M Source/cmake/OptionsCocoa.cmake
Log Message:
-----------
[CMake] Fix x86_64 build
rdar://178456325
https://bugs.webkit.org/show_bug.cgi?id=316026
Unreviewed, build fix.
The x86_64 CMake build fails for a few independent reasons. The nasm
assembler used for the x86_64 libvpx sources inherits the global Clang
compile options through add_compile_options(), but it doesn't understand
flags like -isystem, -iframework, or -w, and nasm 3.x no longer parses -MD
as a two-token dependency flag. The vpx warning suppressions and the Cocoa
warning/debug-prefix-map options are likewise applied to every language,
which is wrong now that ASM_NASM is in the mix. testb3 also fails to build
because stack-exhausted is treated as an error.
This patch scopes the assembler invocation to the flags nasm actually
accepts, restricts the warning and prefix-map options to the C-family
languages, drops an opus source that isn't built on this configuration, and
demotes stack-exhausted to a warning for testb3.
* Source/JavaScriptCore/shell/CMakeLists.txt:
Demote stack-exhausted to a warning for testb3.
* Source/ThirdParty/libwebrtc/CMakeLists.txt:
Override CMAKE_ASM_NASM_COMPILE_OBJECT so only nasm-compatible flags are
passed, mirroring how the Xcode build invokes yasm. Restrict the vpx
warning suppressions to C/CXX and drop prefilter_FIX_sse.c.
* Source/cmake/OptionsCocoa.cmake:
Restrict the warning suppressions and debug-prefix-map options to
C/CXX/OBJC/OBJCXX rather than every non-Swift language, and add
-Wno-objc-signed-char-bool-implicit-float-conversion and
-Wno-unused-parameter.
Canonical link: https://commits.webkit.org/314712@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
