Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 928e2e7434696158347bc72e7b4a6bb57b1fb7c0
https://github.com/WebKit/WebKit/commit/928e2e7434696158347bc72e7b4a6bb57b1fb7c0
Author: Geoffrey Garen <[email protected]>
Date: 2026-05-06 (Wed, 06 May 2026)
Changed paths:
M Source/WebKit/PlatformIOS.cmake
M Source/cmake/OptionsCocoa.cmake
M Source/cmake/OptionsIOS.cmake
M Source/cmake/OptionsMac.cmake
A Source/cmake/WebKitXcrun.cmake
Log Message:
-----------
[CMake] Ensure that toolchain and SDK match
https://bugs.webkit.org/show_bug.cgi?id=314167
rdar://176327916
Reviewed by Pascoe and David Kilzer.
If you install Xcode A and download and xcode-select Xcode B, then
xcrun <tool> gives you Xcode B's toolchain, but xcrun --show-sdk-*
gives you Xcode A's SDK. Chaos ensues.
Specifying xcrun --sdk <sdk name> ensures that you get Xcode B in
both cases.
* Source/WebKit/PlatformIOS.cmake: Use the WEBKIT_XCRUN helper to
make sure we find the right actool. Use ${CMAKE_C_COMPILER} to be
consistent with the rest of the build.
* Source/cmake/OptionsCocoa.cmake: Use the WEBKIT_XCRUN helper to
make sure we find the right libtool.
* Source/cmake/OptionsIOS.cmake:
* Source/cmake/OptionsMac.cmake: Use the WEBKIT_RESOLVE_SDK helper
to makes sure we get the right one and reduce code duplication.
* Source/cmake/WebKitXcrun.cmake: New helpers for saving <sdk name>
and specifying --sdk <sdk name> when we invoke xcrun.
Canonical link: https://commits.webkit.org/312690@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
