Adopt FALLBACK_PLATFORM

https://bugs.webkit.org/show_bug.cgi?id=219504

Patch by Adam Roben <aroben@apple.com> on 2020-12-03
Reviewed by Tim Horton.

PerformanceTests:

* MediaTime/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM
it if it's defined, otherwise use PLATFORM_NAME as before.

Source/bmalloc:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/JavaScriptCore:

* Configurations/SDKVariant.xcconfig:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Scripts/check-xcfilelists.sh:
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
as before.

Source/ThirdParty:

* gtest/xcode/Config/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if
it's defined, otherwise use PLATFORM_NAME as before.

Source/ThirdParty/ANGLE:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/ThirdParty/libwebrtc:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/WebCore:

* Configurations/SDKVariant.xcconfig:
* Scripts/check-xcfilelists.sh:
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
as before.

Source/WebCore/PAL:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/WebInspectorUI:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/WebKit:

* Configurations/SDKVariant.xcconfig:
* Scripts/check-xcfilelists.sh:
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
as before.

Source/WebKitLegacy:

* scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Source/WebKitLegacy/mac:

* Configurations/SDKVariant.xcconfig:
* Configurations/WebKitLegacy.xcconfig:
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
as before.

Source/WTF:

* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
defined, otherwise use PLATFORM_NAME as before.

Tools:

* ContentExtensionTester/Configurations/SDKVariant.xcconfig:
* DumpRenderTree/mac/Configurations/SDKVariant.xcconfig:
* ImageDiff/cg/Configurations/SDKVariant.xcconfig:
* MiniBrowser/Configurations/SDKVariant.xcconfig:
* MobileMiniBrowser/Configurations/SDKVariant.xcconfig:
* TestWebKitAPI/Configurations/SDKVariant.xcconfig:
* WebEditingTester/Configurations/SDKVariant.xcconfig:
* WebKitTestRunner/Configurations/SDKVariant.xcconfig:
* lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig:
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
as before.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index a0de5de..8277532 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * MediaTime/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM
+        it if it's defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-30  Tadeu Zagallo  <tzagallo@apple.com>
 
         Add C and ObjC tests to APIBench

diff --git a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
+++ b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 8f66d85..a64cd7b 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * Scripts/check-xcfilelists.sh:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] not using std::make_pair for workaround of (possibly) ASan bug

diff --git a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
+++ b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index bc03c78..87d7586 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -10987,7 +10987,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n    exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
+                       shellScript = "if [[ ${FALLBACK_PLATFORM:-$PLATFORM_NAME} != \"iphoneos\" ]]; then\n    exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
                };
                3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
                        isa = PBXShellScriptBuildPhase;

diff --git a/Source/JavaScriptCore/Scripts/check-xcfilelists.sh b/Source/JavaScriptCore/Scripts/check-xcfilelists.sh
index 8ceb164..36d0bc9 100755 (executable)
--- a/Source/JavaScriptCore/Scripts/check-xcfilelists.sh
+++ b/Source/JavaScriptCore/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 89ee03a..5a1e28b 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-02  Dean Jackson  <dino@apple.com>
 
         Build fix for Mac Catalyst. Include the SystemInfo header.

diff --git a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 5147097..907034a 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * gtest/xcode/Config/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if
+        it's defined, otherwise use PLATFORM_NAME as before.
+
 2020-10-12  Luming Yin  <luming_yin@apple.com>
 
         [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building 

diff --git a/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig b/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
index e33fc60..88a772c 100644 (file)
--- a/Source/ThirdParty/libwebrtc/ChangeLog
+++ b/Source/ThirdParty/libwebrtc/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-01  Youenn Fablet  <youenn@apple.com>
 
         libwebrtc.dylib relies on dead code stripping (fails to link if dead code is not stripped in Debug builds)

diff --git a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index be27678..33e3af5 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-03  Chris Dumez  <cdumez@apple.com>
 
         Refactor macros for low power mode code

diff --git a/Source/WTF/Configurations/SDKVariant.xcconfig b/Source/WTF/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WTF/Configurations/SDKVariant.xcconfig
+++ b/Source/WTF/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 236b82a..26468eb 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Scripts/check-xcfilelists.sh:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Said Abou-Hallawa  <said@apple.com>
 
         [GPU Process] Disconnect NativeImages from RemoteResourceCacheProxy when RemoteRenderingBackendProxy is destroyed

diff --git a/Source/WebCore/Configurations/SDKVariant.xcconfig b/Source/WebCore/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WebCore/Configurations/SDKVariant.xcconfig
+++ b/Source/WebCore/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 26fad28..60be920 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-30  Per Arne Vollan  <pvollan@apple.com>
 
         [macOS] Adopt SPI to prevent establishing XPC connections to Launch Services

diff --git a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
+++ b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebCore/Scripts/check-xcfilelists.sh b/Source/WebCore/Scripts/check-xcfilelists.sh
index c318aa9..72c36ba 100755 (executable)
--- a/Source/WebCore/Scripts/check-xcfilelists.sh
+++ b/Source/WebCore/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebCore --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index e36c466..fdd211c 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-21  Brian Burg  <bburg@apple.com>
 
         Web Inspector: implement Multimap.prototype.take()

diff --git a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
+++ b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index e1692b1..1d260e8 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Scripts/check-xcfilelists.sh:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Chris Dumez  <cdumez@apple.com>
 
         Drop unimplemented suspension functions on GPUConnectionToWebProcess and WebAuthnConnectionToWebProcess

diff --git a/Source/WebKit/Configurations/SDKVariant.xcconfig b/Source/WebKit/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WebKit/Configurations/SDKVariant.xcconfig
+++ b/Source/WebKit/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebKit/Scripts/check-xcfilelists.sh b/Source/WebKit/Scripts/check-xcfilelists.sh
index 0bb128a..bfb99e8 100755 (executable)
--- a/Source/WebKit/Scripts/check-xcfilelists.sh
+++ b/Source/WebKit/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKit --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKit --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
index a0c9482..334aeb8 100644 (file)
--- a/Source/WebKitLegacy/ChangeLog
+++ b/Source/WebKitLegacy/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-01  Keith Rollin  <krollin@apple.com>
 
         Consolidate header postprocessing scripts

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index 30e913d..2b143dd 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Configurations/WebKitLegacy.xcconfig:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-01  Keith Rollin  <krollin@apple.com>
 
         Consolidate header postprocessing scripts

diff --git a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
index cbcf0b7..863e787 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
@@ -127,7 +127,7 @@ WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
 WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(FALLBACK_PLATFORM:default=$(PLATFORM_NAME))_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
 WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;

diff --git a/Source/WebKitLegacy/scripts/check-xcfilelists.sh b/Source/WebKitLegacy/scripts/check-xcfilelists.sh
index 65f9610..341ed5a 100755 (executable)
--- a/Source/WebKitLegacy/scripts/check-xcfilelists.sh
+++ b/Source/WebKitLegacy/scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index bd4c25b..050b445 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-04  David Kilzer  <ddkilzer@apple.com>
 
         Remove bmalloc::logVMFailure() and BSoftLinking.h

diff --git a/Source/bmalloc/Configurations/SDKVariant.xcconfig b/Source/bmalloc/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Source/bmalloc/Configurations/SDKVariant.xcconfig
+++ b/Source/bmalloc/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c7bef9e..40f6f63 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * ContentExtensionTester/Configurations/SDKVariant.xcconfig:
+        * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig:
+        * ImageDiff/cg/Configurations/SDKVariant.xcconfig:
+        * MiniBrowser/Configurations/SDKVariant.xcconfig:
+        * MobileMiniBrowser/Configurations/SDKVariant.xcconfig:
+        * TestWebKitAPI/Configurations/SDKVariant.xcconfig:
+        * WebEditingTester/Configurations/SDKVariant.xcconfig:
+        * WebKitTestRunner/Configurations/SDKVariant.xcconfig:
+        * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Alex Christensen  <achristensen@webkit.org>
 
         Serialize NFA to disk before converting it to a DFA when compiling a WKContentRuleList

diff --git a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
+++ b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
+++ b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
+++ b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

diff --git a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
index fcdf7e6..5540046 100644 (file)
--- a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
 WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
 WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);