Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 70d5a8f6fd34f7d1282fc49e85b212d4daaddd33
https://github.com/WebKit/WebKit/commit/70d5a8f6fd34f7d1282fc49e85b212d4daaddd33
Author: Elliott Williams <[email protected]>
Date: 2026-06-09 (Tue, 09 Jun 2026)
Changed paths:
M CMakeLists.txt
M Source/WTF/wtf/PlatformCocoa.cmake
M Source/WTF/wtf/PlatformJSCOnly.cmake
M Source/cmake/OptionsIOS.cmake
M Source/cmake/OptionsMac.cmake
A Source/cmake/WebKitXcodeSDK.cmake
R Source/cmake/WebKitXcrun.cmake
Log Message:
-----------
[CMake] Set SDK based on CMAKE_OSX_SYSROOT and pin compiler tools using the
associated toolchain
https://bugs.webkit.org/show_bug.cgi?id=316442
rdar://178844557
Reviewed by Geoffrey Garen and Keith Miller.
CMAKE_OSX_SYSROOT is the built-in variable that controls which SDK is
being used on Apple platforms (misleadingly named, as it works for *any*
Xcode SDK). Clean up some of our logic that resolves and sets
SDK-related things to use this variable. The end result is that one can
customize the active SDK at configure time like:
cmake --preset mac-release -DCMAKE_OSX_SYSROOT=macosx.internal
That SDK will be used to configure the build, and pin compiler tools for
ninja to use.
Restructure xcrun code to run before the initial call to project(),
since that's when the build starts performing compiler checks. Also,
read from the SDK's SDKSettings.json for more discrete information. This
will be used next to get information about the deployment target and
default architectures.
Internal SDK support (for Mac) is not complete. For example, local
WebKitAdditions is not yet supported. But this is enough to get JSC
building on recent internal SDKs.
* CMakeLists.txt:
* Source/WTF/wtf/PlatformCocoa.cmake: Use the correct Mig binary and SDK
root. This reveals an error on the iOS build. Canonically, we do not build
MachExceptions.defs on public embedded SDKs. Add a condition to
reflect this.
* Source/WTF/wtf/PlatformJSCOnly.cmake: Ditto.
* Source/cmake/OptionsIOS.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitXcodeSDK.cmake: Rename of WebKitXcrun, now runs SDK
initialization logic.
* Source/cmake/WebKitXcrun.cmake: Removed.
Canonical link: https://commits.webkit.org/314875@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
