Title: [284759] trunk/Source/WebKitLegacy/mac
- Revision
- 284759
- Author
- [email protected]
- Date
- 2021-10-24 09:53:01 -0700 (Sun, 24 Oct 2021)
Log Message
Enable the modules verifier for WebKitLegacy in Apple internal when using a new enough Xcode
https://bugs.webkit.org/show_bug.cgi?id=232190
Patch by Ian Anderson <[email protected]> on 2021-10-24
Reviewed by David Kilzer.
Add WK_XCODE_VERSION_BEFORE_13_1 build settings to WebKitLegacy and then
use them to enable the modules verifier in Xcode 13.1 and later.
* Configurations/Base.xcconfig:
* Configurations/WebKitLegacy.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (284758 => 284759)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-24 16:01:14 UTC (rev 284758)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-24 16:53:01 UTC (rev 284759)
@@ -1,3 +1,16 @@
+2021-10-24 Ian Anderson <[email protected]>
+
+ Enable the modules verifier for WebKitLegacy in Apple internal when using a new enough Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=232190
+
+ Reviewed by David Kilzer.
+
+ Add WK_XCODE_VERSION_BEFORE_13_1 build settings to WebKitLegacy and then
+ use them to enable the modules verifier in Xcode 13.1 and later.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
2021-10-22 Ian Anderson <[email protected]>
Add a module map file for PrivateFrameworks/WebKitLegacy
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (284758 => 284759)
--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2021-10-24 16:01:14 UTC (rev 284758)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2021-10-24 16:53:01 UTC (rev 284759)
@@ -156,6 +156,14 @@
WK_XCODE_VERSION_BEFORE_11_4_1100_1120 = YES;
WK_XCODE_VERSION_BEFORE_11_4_1100_1130 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_0800 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_0900 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_1000 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_1100 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_1200 = YES;
+WK_XCODE_VERSION_BEFORE_13_1_1300 = $(WK_XCODE_VERSION_BEFORE_13_1_1300_$(XCODE_VERSION_MINOR));
+WK_XCODE_VERSION_BEFORE_13_1_1300_1300 = YES;
+
WK_USER_LTO_MODE = $(WK_USER_LTO_MODE_$(WK_LTO_MODE));
WK_USER_LTO_MODE_full = YES;
WK_USER_LTO_MODE_thin = YES_THIN;
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (284758 => 284759)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-10-24 16:01:14 UTC (rev 284758)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-10-24 16:53:01 UTC (rev 284759)
@@ -160,9 +160,8 @@
DEFINES_MODULE = $(DEFINES_MODULE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
DEFINES_MODULE_COCOA_TOUCH_YES = YES;
-// Re-enable the modules verifier tool when all the builders have upgraded to Xcode 13.0 GM or later.
-//CLANG_MODULES_ENABLE_VERIFIER_TOOL = $(CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)_$(USE_INTERNAL_SDK));
-//CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_YES_YES = YES;
+CLANG_MODULES_ENABLE_VERIFIER_TOOL = $(CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)_$(USE_INTERNAL_SDK));
+CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_YES_YES = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_13_1_$(XCODE_VERSION_MAJOR)));
MODULEMAP_FILE = $(MODULEMAP_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
MODULEMAP_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.modulemap;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
