[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
aprotyas · Jan 27, 2024 · 0b96465 · 0b96465
1 parent bc09d3d
commit 0b96465
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/Configurations/SDKAdditions.xcconfig b/Configurations/SDKAdditions.xcconfig
@@ -41,6 +41,6 @@ WK_ADDITIONAL_SDKS_UNVERSIONED_YES_VERSIONED_YES = $(WK_UNVERSIONED_SDK_ADDITION
 // The SDK directory where private frameworks are expected to be. Set to the base SDK when building
 // internally or on macOS, and the additions SDK otherwise.
 WK_PRIVATE_SDK_DIR = $(WK_PRIVATE_SDK_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_SDK_DIR_ = $(SDK_DIR_WebKitSDKAdditions);
+WK_PRIVATE_SDK_DIR_ = $(SDK_DIR_WebKitSDKAdditions_$(PLATFORM_NAME));
 WK_PRIVATE_SDK_DIR_[sdk=macos*] = $(SDK_DIR);
 WK_PRIVATE_SDK_DIR_YES = $(SDK_DIR);
diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -3794,14 +3794,14 @@
 			files = (
 			);
 			inputFileListPaths = (
-				"$(SDK_DIR_WebKitSDKAdditions:default=Scripts)/SymlinkedHeaders.xcfilelist",
+				"$(SDK_DIR_WebKitSDKAdditions_$(PLATFORM_NAME):default=Scripts)/SymlinkedHeaders.xcfilelist",
 			);
 			inputPaths = (
 				"$(SRCROOT)/Scripts/symlink-public-sdk-headers-for-embedded-platforms",
 			);
 			name = "Symlink public SDK headers";
 			outputFileListPaths = (
-				"$(SDK_DIR_WebKitSDKAdditions:default=Scripts)/SymlinkedHeaders-output.xcfilelist",
+				"$(SDK_DIR_WebKitSDKAdditions_$(PLATFORM_NAME):default=Scripts)/SymlinkedHeaders-output.xcfilelist",
 			);
 			outputPaths = (
 				"$(WK_DERIVED_SDK_HEADERS_DIR)",

diff --git a/WebKitLibraries/SDKs/appletvos16.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/appletvos16.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_appletvos</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/appletvos17.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/appletvos17.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_appletvos</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/appletvsimulator17.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/appletvsimulator17.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_appletvsimulator</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/iphoneos16.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/iphoneos16.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>CanonicalName</key>
-    <string>WebKitSDKAdditions</string>
+    <string>WebKitSDKAdditions_iphoneos</string>
     <key>IsBaseSDK</key>
     <string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/iphoneos17.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/iphoneos17.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_iphoneos</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>HeaderSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/iphonesimulator16.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/iphonesimulator16.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>CanonicalName</key>
-    <string>WebKitSDKAdditions</string>
+    <string>WebKitSDKAdditions_iphonesimulator</string>
     <key>IsBaseSDK</key>
     <string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/iphonesimulator17.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/iphonesimulator17.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_iphonesimulator</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>HeaderSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/macosx12.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/macosx12.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_macosx</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<!-- The public macOS SDK has a private frameworks directory, so we need to add a search path instead of overriding it via WK_PRIVATE_SDK_DIR. -->

diff --git a/WebKitLibraries/SDKs/macosx13.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/macosx13.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_macosx</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<!-- The public macOS SDK has a private frameworks directory, so we need to add a search path instead of overriding it via WK_PRIVATE_SDK_DIR. -->

diff --git a/WebKitLibraries/SDKs/macosx14.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/macosx14.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_macosx</string>
 	<key>HeaderSearchPaths</key>
 	<array>
 		<string>usr/local/include</string>

diff --git a/WebKitLibraries/SDKs/watchos10.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/watchos10.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_watchos</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/watchos9.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/watchos9.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_watchos</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>

diff --git a/WebKitLibraries/SDKs/watchsimulator10.0-additions.sdk/SDKSettings.plist b/WebKitLibraries/SDKs/watchsimulator10.0-additions.sdk/SDKSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CanonicalName</key>
-	<string>WebKitSDKAdditions</string>
+	<string>WebKitSDKAdditions_watchsimulator</string>
 	<key>IsBaseSDK</key>
 	<string>NO</string>
     <key>FrameworkSearchPaths</key>