[webkit-changes] [WebKit/WebKit] 0b9646: [Xcode] Additions SDKs need to have platform-speci...

[Elliott Williams]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 0b964655403e152cc5f3553db576cb0cd5bb9d7d
      https://github.com/WebKit/WebKit/commit/0b964655403e152cc5f3553db576cb0cd5bb9d7d
  Author: Elliott Williams <emw at apple.com>
  Date:   2024-01-26 (Fri, 26 Jan 2024)

  Changed paths:
    M Configurations/SDKAdditions.xcconfig
    M Source/WTF/WTF.xcodeproj/project.pbxproj
    M WebKitLibraries/SDKs/appletvos16.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/appletvos17.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/appletvsimulator17.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/iphoneos16.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/iphoneos17.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/iphonesimulator16.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/iphonesimulator17.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/macosx12.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/macosx13.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/macosx14.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/watchos10.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/watchos9.0-additions.sdk/SDKSettings.plist
    M WebKitLibraries/SDKs/watchsimulator10.0-additions.sdk/SDKSettings.plist

  Log Message:
  -----------
  [Xcode] Additions SDKs need to have platform-specific names
rdar://121698895
https://bugs.webkit.org/show_bug.cgi?id=268205

Reviewed by Alexey Proskuryakov.

Instead of calling all additions SDKs "WebKitSDKAdditions", include a
platform name suffix, so that the build can refer to the active
additions SDK with:

    SDK_DIR_WebKitSDKAdditions_$(PLATFORM_NAME))

This appears to fix build issues when using the Xcode IDE.

Use PLATFORM_NAME and not WK_PLATFORM_NAME so that Mac Catalyst does not
get a special platform name. This matters since the same macOS SDK
supports both variants.

* Configurations/SDKAdditions.xcconfig:
* Source/WTF/WTF.xcodeproj/project.pbxproj:
* WebKitLibraries/SDKs/appletvos16.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/appletvos17.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/appletvsimulator17.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/iphoneos16.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/iphoneos17.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/iphonesimulator16.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/iphonesimulator17.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/macosx12.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/macosx13.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/macosx14.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/watchos10.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/watchos9.0-additions.sdk/SDKSettings.plist:
* WebKitLibraries/SDKs/watchsimulator10.0-additions.sdk/SDKSettings.plist:

Canonical link: https://commits.webkit.org/273594@main