Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 68900c1e2adc8b79d928f39468a55183dcdf4878
https://github.com/WebKit/WebKit/commit/68900c1e2adc8b79d928f39468a55183dcdf4878
Author: Brent Fulgham <[email protected]>
Date: 2026-10-08 (Thu, 08 Oct 2026)
Changed paths:
M Makefile.shared
M Tools/Scripts/set-webkit-configuration
Log Message:
-----------
[Cocoa] Prevent make from wiping the cmake build system
https://bugs.webkit.org/show_bug.cgi?id=326752
rdar://189460132
Reviewed by Jean-Yves Avenard.
Every make invocation passed --xcode to set-webkit-configuration, which records
Xcode as the build system and
deletes the BuildSystem.xcconfig that build-webkit --cmake leaves behind. A
caller that builds on top of a CMake
WebKit then silently stopped finding that WebKit.
Pass the option through BUILD_SYSTEM_OPTION, which still defaults to --xcode,
so callers can clear it. Nothing
changes for a caller that does not.
That alone would leave the Xcode workspace stale. set-webkit-configuration only
recorded the workspace for a
non-CMake build, so after make for one workspace and then build-webkit --cmake,
a make for another workspace kept
the first one and xcodebuild failed to find its scheme. Record the workspace
whenever one is passed. The CMake build
of WebKit does not use it, but an Xcode build above that WebKit does.
No new tests. These are build system scripts; checked with make -n for each
GROUP, with a real make that left the
recorded CMake build system and its BuildSystem.xcconfig in place, and by
running set-webkit-configuration through
Xcode, CMake, and a change of workspace under CMake, which now records the new
workspace each time.
* Makefile.shared:
* Tools/Scripts/set-webkit-configuration:
Canonical link: https://commits.webkit.org/323181@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
