Attachment 349588 Details for Bug 189553 – Patch

[patch] Patch

bug-189553-20180912152754.patch (text/plain), 93.51 KB, created by Jer Noble on 2018-09-12 15:27:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-09-12 15:27:57 PDT

Size: 93.51 KB

patch

obsolete

>Subversion Revision: 235922
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index e60abee4189f1442afc52c598099305a20175ed1..4c0c66d754ddd504b106b3ecdfbb050b5ecc9963 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1 +1,11 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> == Rolled over to ChangeLog-2018-09-11 ==
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index 3a2b1dbafdcf50c4dc99fa55c8333ec66ce62731..6faeb02d494fa21d36d2c0dc5051b7afced82043 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-08-29  David Kilzer  <ddkilzer@apple.com>
> 
>         Remove empty directories from from svn.webkit.org repository
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index 6274d2ba5b9482a1f944e85489ec02042feaa0dc..c3ad69387d4e4837dc5289f65e1e5c81de9c581c 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-09-07  Youenn Fablet  <youenn@apple.com>
> 
>         Add support for unified plan transceivers
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index e60abee4189f1442afc52c598099305a20175ed1..4c0c66d754ddd504b106b3ecdfbb050b5ecc9963 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1 +1,11 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> == Rolled over to ChangeLog-2018-09-11 ==
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1d3bf20823493f367b2f35e5d718f5ea571db61..dae1cff2398cd991031fe3e10a83769d908caa7b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+        * Configurations/WebCore.xcconfig:
>+
> 2018-08-24  Jer Noble  <jer.noble@apple.com>
> 
>         Using Touch Bar to scrub video on Youtube results in video playback freeze
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index aa388ca8fd294fec4911af8950664f8a6c388f3b..b6d9d14e3054023d527754dd852ee75db620ea3f 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/PAL.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-09-10  James Savage  <james.savage@apple.com>
> 
>         Expose -apple-system-container-border color to internal web views.
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index beed0a4f970191c6ced6780d773552b2ca4fdea2..7b17efdc76bc7482fa178993b998327163d91d9f 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-09-11  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: Fix typo "vritualized"
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 376021085f0e746bddca260f05c909db0b7fe5ee..1e3f663c94ff5f53cff261de1f86b748cf035553 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/BaseTarget.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-09-07  Dean Jackson  <dino@apple.com>
> 
>         Add and expose Internal features from WebKit
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index e97d88be213543193a59c3534d8a4159f0ecaa95..903fc847ebbd5ca5ea517013c529b78a151986a2 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+        * Configurations/WebKitLegacy.xcconfig:
>+
> 2018-09-10  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Remove unused needsDestruction class variables from HashTraits
>diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
>index d469040dde3f989ef453123f934d329c6c83c59c..37f8f4a8f5ad0f836150c03238603be700cd0eb9 100644
>--- a/Source/bmalloc/ChangeLog
>+++ b/Source/bmalloc/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-08-27  Keith Rollin  <krollin@apple.com>
> 
>         Unreviewed build fix -- disable LTO for production builds
>diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
>index e55506c9dcb9eeba16104831b981c127efeb5a5b..53aa0e399015ec712d96327bb117215a01833609 100644
>--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -146,12 +147,7 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
> WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
>@@ -162,13 +158,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRA
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
> 
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>index 53baae7791700ea5901ff5aa469f9005e9fb5f09..5cafd7655d8b1d5bc67a3d073ded2a4f9057670f 100644
>--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -68,20 +69,10 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
> ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
> ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>diff --git a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>index fbc8a523c345f1bc112e7d0b75d5041d266b5998..39a7b3619efe223293d37dfc547cea10fab700ec 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfign"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -95,10 +96,6 @@ EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = $(inherited) "$(PROJECT_DIR)/Source/
> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WTF/Configurations/Base.xcconfig b/Source/WTF/Configurations/Base.xcconfig
>index e4a51feb1e68c50ac744217c8824d0bb875ec49c..2ba6328b39c5404efd4bf85e585c93531f291137 100644
>--- a/Source/WTF/Configurations/Base.xcconfig
>+++ b/Source/WTF/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -132,20 +133,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
>-WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>diff --git a/Source/WTF/Configurations/SDKVariant.xcconfig b/Source/WTF/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WTF/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
>index 5e0aaf33ab81c2da64122a52ac208f55f3963d06..c4ba9f890afa6e55b9d712ea0574094509b05563 100644
>--- a/Source/WebCore/Configurations/Base.xcconfig
>+++ b/Source/WebCore/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -123,19 +124,6 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
> LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebCore/Configurations/SDKVariant.xcconfig b/Source/WebCore/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WebCore/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index a0befd4fdf5463e9975164d77516ee38322ec007..6a84ed064ca35cd1b59b43ad2f8e93e7f1bf3e5c 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -168,10 +168,6 @@ JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCor
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebCore/PAL/Configurations/Base.xcconfig b/Source/WebCore/PAL/Configurations/Base.xcconfig
>index 066c155476e35aa1a394c21500996ff0c48e3e61..fa4b14c2f619c454deabd2e20ec7f6e64a3cd684 100644
>--- a/Source/WebCore/PAL/Configurations/Base.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -120,19 +121,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>index 95fa0ccfc41831f800a1fba057005d251c971821..53b7c50214bf695a1aa1dbe72f0642781ec59c5e 100644
>--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>@@ -53,11 +53,6 @@ PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEW
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_NO = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebInspectorUI/Configurations/Base.xcconfig b/Source/WebInspectorUI/Configurations/Base.xcconfig
>index 540f6c17931bffcd13099565fb8b5718eb185fd2..3dfff44d194cad718392a7cd2f5ea6be06aa7d33 100644
>--- a/Source/WebInspectorUI/Configurations/Base.xcconfig
>+++ b/Source/WebInspectorUI/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -80,12 +81,7 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> COMBINE_INSPECTOR_RESOURCES = YES;
> COMBINE_TEST_RESOURCES = NO;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
> WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
>@@ -93,10 +89,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebKit/Configurations/Base.xcconfig b/Source/WebKit/Configurations/Base.xcconfig
>index c1d7476d42225b5dc6cbede95c6cb9dae71a8158..8c83958b14211f35dd7e37fba4f0d5fb1bafb5db 100644
>--- a/Source/WebKit/Configurations/Base.xcconfig
>+++ b/Source/WebKit/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -131,19 +132,6 @@ TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
> // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
> LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 405d63bbb012a39e65da8ba8b8908358a258bd6c..1ef156c84c91021196132746d90995ec8e856fdd 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -96,10 +96,6 @@ WK_MANUAL_SANDBOXING_ENABLED[sdk=macosx*] = YES;
> WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
> WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebKit/Configurations/SDKVariant.xcconfig b/Source/WebKit/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WebKit/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>index 9e959540bc3f417a679ad494cca84c155724eb3b..a0f16cae8dcfad0e532234190fc08100a544a4c6 100644
>--- a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -121,19 +122,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 993fac544d20a510fa40fc2dc36cb0cbbce3f584..571d22269b4191edfdbb26462302749de41c990f 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -121,10 +121,6 @@ WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $
> 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;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/bmalloc/Configurations/Base.xcconfig b/Source/bmalloc/Configurations/Base.xcconfig
>index 60f8cc635f9063633492277bcd3144eeda6fefbc..c04afb59e20a2348011e14fa4c9c405ef4385922 100644
>--- a/Source/bmalloc/Configurations/Base.xcconfig
>+++ b/Source/bmalloc/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -124,20 +125,10 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
> BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
> BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>diff --git a/Source/bmalloc/Configurations/SDKVariant.xcconfig b/Source/bmalloc/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Source/bmalloc/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f547fb0dea66ef50b2fae2545aabcd0a46414966..277216116f642d8fbdf0bc4649b3e692fd1187b5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * ContentExtensionTester/Configurations/Base.xcconfig:
>+        * ContentExtensionTester/Configurations/SDKVariant.xcconfig: Added.
>+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
>+        * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig: Added.
>+        * ImageDiff/cg/Configurations/Base.xcconfig:
>+        * ImageDiff/cg/Configurations/SDKVariant.xcconfig: Added.
>+        * MiniBrowser/Configurations/Base.xcconfig:
>+        * MiniBrowser/Configurations/SDKVariant.xcconfig: Added.
>+        * MobileMiniBrowser/Configurations/Base.xcconfig:
>+        * MobileMiniBrowser/Configurations/SDKVariant.xcconfig: Added.
>+        * TestWebKitAPI/Configurations/Base.xcconfig:
>+        * TestWebKitAPI/Configurations/SDKVariant.xcconfig: Added.
>+        * WebEditingTester/Configurations/Base.xcconfig:
>+        * WebEditingTester/Configurations/SDKVariant.xcconfig: Added.
>+        * WebKitLauncher/Configurations/SDKVariant.xcconfig: Added.
>+        * WebKitTestRunner/Configurations/Base.xcconfig:
>+        * WebKitTestRunner/Configurations/SDKVariant.xcconfig: Added.
>+        * lldb/lldbWebKitTester/Configurations/Base.xcconfig:
>+        * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-08-16  Jer Noble  <jer.noble@apple.com>
> 
>         REGRESSION (234743) Timeouts in TestWebKitAPI.PreferredAudioBufferSize.AudioWithWebAudio and TestWebKitAPI.PreferredAudioBufferSize.WebAudio
>diff --git a/Tools/ContentExtensionTester/Configurations/Base.xcconfig b/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>index d1fcdb1164f30f97b78309717adf5b47ae836a9b..375daac1101d39544fbf1cdba7a08b7161d3548a 100644
>--- a/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>+++ b/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>index 4854ec7dd2fd090e07a84be37dc76e0d41ad4e6a..c3484670fe59aea05a78de7e7540e1b2d72dcda5 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>@@ -22,16 +22,13 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
> USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
> USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
> WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
> WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>diff --git a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/ImageDiff/cg/Configurations/Base.xcconfig b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>index 82510ad7c44b33e3928257ccd5fdaa992ee22baa..99a9e0bc37bbd95f2bf86e019c791ffa59bff1f7 100644
>--- a/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>+++ b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/MiniBrowser/Configurations/Base.xcconfig b/Tools/MiniBrowser/Configurations/Base.xcconfig
>index b9854db68777d88004b1b4d68a9bd7cba1c4f73c..8add79670aba5c2a06afea5e9ef74a42151ac939 100644
>--- a/Tools/MiniBrowser/Configurations/Base.xcconfig
>+++ b/Tools/MiniBrowser/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/MobileMiniBrowser/Configurations/Base.xcconfig b/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>index f9cac161ea48a7229f30220f0f7970d3adbf5c47..99aa33dcfd2840e445495b25de8cf0ae72b539d5 100644
>--- a/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>+++ b/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>index 3f4bdfbc9b614d27381079ce4602a66e4226c4bf..dade9a1abbb7c1db779457c9ff299afa57d4ac1e 100644
>--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -100,16 +101,6 @@ OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/WebEditingTester/Configurations/Base.xcconfig b/Tools/WebEditingTester/Configurations/Base.xcconfig
>index d848ff82783ab851c67c27249213126a809ae07e..22849c63e2d204b7d70d15b4c922ed279a31ff2e 100644
>--- a/Tools/WebEditingTester/Configurations/Base.xcconfig
>+++ b/Tools/WebEditingTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig b/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>index 6efeda752da3824bc1e77cb9ff90f963a492db56..73915615840658548aaa234ed929e94abc9b31c8 100644
>--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -81,10 +82,6 @@ WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
> WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
> WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
> WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
> WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>diff --git a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>index 8c0e7d8035267b7fe7b472c2c42b0bf6db368d4e..aa1949cf7abcbb5e8a2c07b6a0d915b384159f5e 100644
>--- a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>+++ b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)
>diff --git a/ChangeLog b/ChangeLog
>index 7180ea47c5f071147f38673e8b4df85f4afceed7..5f1a89a5c3a6680e15f47ee842d0e49fbc463f36 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Makefile.shared:
>+
> 2018-09-10  Tim Horton  <timothy_horton@apple.com>
> 
>         Make it easier to build for SDK_VARIANT=iosmac
>diff --git a/Makefile.shared b/Makefile.shared
>index 87e7ad260b9cd98bcd62b80b4b8007acc5c77a96..8116ba4a9f8b81bbb72226137c9b9aa1124d013d 100644
>--- a/Makefile.shared
>+++ b/Makefile.shared
>@@ -34,9 +34,8 @@ ifneq (,$(ARCHS))
> 	endif
> endif
> 
>-ifeq (iosmac,$(SDK_VARIANT))
>-	XCODE_OPTIONS += SDK_VARIANT=iosmac
>-	XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
>+ifneq (,$(SDK_VARIANT))
>+	XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
> endif
> 
> DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
>diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
>index b92eabdf34409f4eb55c8616513fee661defb86d..15b3e8934cd3a94efcbe2e6c38195486ba121aca 100644
>--- a/PerformanceTests/ChangeLog
>+++ b/PerformanceTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MediaTime/Configurations/Base.xcconfig:
>+        * MediaTime/Configurations/SDKVariant.xcconfig: Added.
>+
> 2018-08-27  Aditya Keerthi  <akeerthi@apple.com>
> 
>         Consolidate ENABLE_INPUT_TYPE_COLOR and ENABLE_INPUT_TYPE_COLOR_POPOVER
>diff --git a/PerformanceTests/MediaTime/Configurations/Base.xcconfig b/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>index 0dbe8bf0184801883475c9dbd838c2568d899272..4dfdaead5402dafb9b1a81f92653d95b83e2d79e 100644
>--- a/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>+++ b/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..883b424f5a2c52a42f54faf706b2b0aa89854669
>--- /dev/null
>+++ b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2018 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+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)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)))
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+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);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME)
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME)

Actions: View | Formatted Diff | Diff

Attachments on bug 189553: 349561 | 349588 | 349598 | 349606 | 353528 | 353536 | 353552 | 358965 | 359375 | 359526 | 359527