Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 72c0e09bb8dc2b86ffa8c2527398b64b71649f21
https://github.com/WebKit/WebKit/commit/72c0e09bb8dc2b86ffa8c2527398b64b71649f21
Author: David Kilzer <[email protected]>
Date: 2026-04-08 (Wed, 08 Apr 2026)
Changed paths:
M Source/WebKit/Configurations/BaseTarget.xcconfig
M Source/WebKit/Configurations/BaseXPCService.xcconfig
M Source/WebKit/Configurations/GPUService.xcconfig
M Source/WebKit/Configurations/NetworkService.xcconfig
M Source/WebKit/Configurations/WebContentService.xcconfig
Log Message:
-----------
[Xcode] Clean up OTHER_LDFLAGS for WebKit services
https://bugs.webkit.org/show_bug.cgi?id=252220
<rdar://105427340>
Reviewed by Elliott Williams.
Each XPC service xcconfig duplicated flags already defined in
BaseXPCService.xcconfig (such as `$(OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH)`
and `$(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS)`) and independently added
`$(SOURCE_VERSION_LDFLAGS)`. Centralize `$(SOURCE_VERSION_LDFLAGS)` in
BaseXPCService.xcconfig and remove the duplicated flags from each
service, keeping only service-specific additions via `$(inherited)`.
Use the `:default=` operator so `OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH`
in BaseTarget.xcconfig reads `$(WK_NEEDS_STAGED_FRAMEWORK_PATH_LDFLAG)`
when set, falling back to `$(USE_STAGING_INSTALL_PATH)`. This lets
WebContentService.xcconfig override the staged-framework-path condition
by setting `WK_NEEDS_STAGED_FRAMEWORK_PATH_LDFLAG` rather than
duplicating the entire `OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH`
computation.
* Source/WebKit/Configurations/BaseTarget.xcconfig:
(OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH):
- Use `:default=` to read `WK_NEEDS_STAGED_FRAMEWORK_PATH_LDFLAG`
with `$(USE_STAGING_INSTALL_PATH)` as fallback.
* Source/WebKit/Configurations/BaseXPCService.xcconfig:
(OTHER_LDFLAGS):
- Add `$(SOURCE_VERSION_LDFLAGS)`.
* Source/WebKit/Configurations/GPUService.xcconfig:
(OTHER_LDFLAGS): Delete.
* Source/WebKit/Configurations/NetworkService.xcconfig:
(OTHER_LDFLAGS): Delete.
(OTHER_LDFLAGS[sdk=macosx*]): Delete.
(ENTITLEMENTS_REQUIRED):
- Add missing semicolon.
* Source/WebKit/Configurations/WebContentService.xcconfig:
(WK_NEEDS_STAGED_FRAMEWORK_PATH_LDFLAG):
- Set from `$(WK_WEBCONTENT_SERVICE_NEEDS_STAGED_FRAMEWORK_PATH_LDFLAG)`
to override the BaseTarget.xcconfig default.
(OTHER_LDFLAGS):
- Keep only `$(WK_APPKIT_LDFLAGS)` and `$(OTHER_LDFLAGS_PLATFORM)`.
Canonical link: https://commits.webkit.org/310771@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
