[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
with Xcode 12 on macOS Big Sur SUs
https://bugs.webkit.org/show_bug.cgi?id=217602
rdar://70194453
Patch by Luming Yin <luming_yin@apple.com> on 2020-10-12
Reviewed by Darin Adler.
The previous workaround turns out to be ineffective because we can't set the value of
TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
adjust MAC_OS_X_VERSION_MAJOR to 110000.
PerformanceTests:
* DecoderTest/Configurations/DebugRelease.xcconfig:
* MediaTime/Configurations/DebugRelease.xcconfig:
Source/bmalloc:
* Configurations/DebugRelease.xcconfig:
Source/JavaScriptCore:
* Configurations/DebugRelease.xcconfig:
Source/ThirdParty:
* gtest/xcode/Config/General.xcconfig:
Source/ThirdParty/ANGLE:
* Configurations/DebugRelease.xcconfig:
Source/ThirdParty/libwebrtc:
* Configurations/DebugRelease.xcconfig:
Source/WebCore:
* Configurations/DebugRelease.xcconfig:
Source/WebCore/PAL:
* Configurations/DebugRelease.xcconfig:
Source/WebInspectorUI:
* Configurations/DebugRelease.xcconfig:
Source/WebKit:
* Configurations/DebugRelease.xcconfig:
Source/WebKitLegacy/mac:
* Configurations/DebugRelease.xcconfig:
Source/WTF:
* Configurations/DebugRelease.xcconfig:
Tools:
* ContentExtensionTester/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* ImageDiff/cg/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebEditingTester/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@268371 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig b/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
index 9212387..de6d310 100644
--- a/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
+++ b/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
@@ -27,15 +27,17 @@
ONLY_ACTIVE_ARCH = YES;
// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
+TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
+TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
+TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
+TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
+TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
+TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
+TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
+TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
