diff --git a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
+++ b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
+++ b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig b/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WTF/Configurations/SDKVariant.xcconfig b/Source/WTF/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WTF/Configurations/SDKVariant.xcconfig
+++ b/Source/WTF/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebCore/Configurations/SDKVariant.xcconfig b/Source/WebCore/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebCore/Configurations/SDKVariant.xcconfig
+++ b/Source/WebCore/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
+++ b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebGPU/Configurations/SDKVariant.xcconfig b/Source/WebGPU/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebGPU/Configurations/SDKVariant.xcconfig
+++ b/Source/WebGPU/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
+++ b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
index 8b294a3..e53f70b 100644
--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
@@ -134,11 +134,10 @@
 OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_VERSIONED_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
 OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
 
-// webpushd should not be installed when building for downlevel.
-WK_SKIP_INSTALL_WEBPUSHD[sdk=macos*] = $(WK_SKIP_INSTALL_WEBPUSHD_STAGING_$(USE_STAGING_INSTALL_PATH)_RELOCATABLE_$(WK_RELOCATABLE_FRAMEWORKS))
-WK_SKIP_INSTALL_WEBPUSHD_STAGING_YES_RELOCATABLE_YES = YES
-WK_SKIP_INSTALL_WEBPUSHD_STAGING_YES_RELOCATABLE_ = YES
-WK_SKIP_INSTALL_WEBPUSHD_STAGING__RELOCATABLE_YES = YES
+WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx*] = $(WK_OR_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_IS_CATALYST));
+// webpushd should not be installed when building for downlevel on <= 12.
+WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx11*] = YES;
+WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx12*] = YES;
 
 WK_HAVE_CORE_PREDICTION = YES;
 
diff --git a/Source/WebKit/Configurations/SDKVariant.xcconfig b/Source/WebKit/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebKit/Configurations/SDKVariant.xcconfig
+++ b/Source/WebKit/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Source/bmalloc/Configurations/SDKVariant.xcconfig b/Source/bmalloc/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Source/bmalloc/Configurations/SDKVariant.xcconfig
+++ b/Source/bmalloc/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
+++ b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
+++ b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
+++ b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
index 8ed91c1..f8fc992 100644
--- a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
+++ b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
@@ -26,6 +26,16 @@
 WK_NOT_NO = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
diff --git a/Tools/sanitizer/sanitizer.xcconfig b/Tools/sanitizer/sanitizer.xcconfig
index 2bc02dd..e7ca0b5 100644
--- a/Tools/sanitizer/sanitizer.xcconfig
+++ b/Tools/sanitizer/sanitizer.xcconfig
@@ -2,6 +2,16 @@
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_OR__ = NO
+WK_OR_NO_NO = NO
+WK_OR__NO = NO
+WK_OR_NO_ = NO
+WK_OR_YES_ = YES
+WK_OR__YES = YES
+WK_OR_YES_NO = YES
+WK_OR_NO_YES = YES
+WK_OR_YES_YES = YES
+
 WK_OVERRIDE_OPTIMIZATION_LEVEL = $(WK_NOT_$(WK_EMPTY_$(WK_FORCE_OPTIMIZATION_LEVEL)));
 
 GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_OVERRIDE_$(WK_OVERRIDE_OPTIMIZATION_LEVEL));