Fix build failures introduced in "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK"
https://bugs.webkit.org/show_bug.cgi?id=240408
Reviewed by Alexey Proskuryakov.
Revert "Revert "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK""
This reverts commit 680fe6580f261df69a607a33b6252f3e19704169.
Apply small fixups across xcconfig files to address regressions:
- Fix SYSTEM_HEADER_SEARCH_PATHS not referring to Catlyst's include
directory.
- Replace /usr/local/include literal in PROFILE_DATA_PATH with
WK_ALTERNATE_WEBKIT_SDK_PATH and WK_LIBRARY_HEADERS_FOLDER_PATH to
select the correct profdata for Catalyst or self-contained builds.
- Source/JavaScriptCore/Configurations/Base.xcconfig: Clean up an old
WK_STATICLIB_INSTALL_PREFIX, replacing it with
WK_LIBRARY_HEADERS_FOLDER_PATH.
- Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig:
- Source/WebCore/Configurations/WebCore.xcconfig:
- Source/WebCore/PAL/Configurations/PAL.xcconfig:
- Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj: PAL's
SDKVariant.xcconfig was not included in the project for some reason.
This is fine for building (as it's still includable) but prevents
Xcode from indexing it. Add it.
- Source/WebGPU/Configurations/WGSL.xcconfig:
- Source/WebGPU/Configurations/WebGPU.xcconfig:
- Source/WebKit/Configurations/BaseTarget.xcconfig:
- Source/WebKit/Configurations/SandboxProfiles.xcconfig: Clean up an old
WK_STATICLIB_INSTALL_PREFIX setting. We don't need to redirect sandbox
profiles to a separate directory, like we do headers and static
libraries, so leave these paths hard coded to /usr/local/include.
- Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:
Canonical link: https://commits.webkit.org/251225@main
