Title: [286645] trunk/Source/ThirdParty/ANGLE
- Revision
- 286645
- Author
- [email protected]
- Date
- 2021-12-07 23:27:20 -0800 (Tue, 07 Dec 2021)
Log Message
[MacCatalyst] Fix build after r286603
https://bugs.webkit.org/show_bug.cgi?id=233977
Unreviewed.
Previously, TARGET_OS_IOS and TARGET_OS_MACCATALYST were never on at the same time.
Now, they're on at the same time, and ANGLE doesn't expect that. This patch turns
off TARGET_OS_IOS when TARGET_OS_MACCATALYST is on, just to get ANGLE to build.
The long-term fix is to either update all the sites to use correct macros, or to
use the ANGLE_PLATFORM_* defines instead.
* src/common/platform.h:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (286644 => 286645)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-08 06:43:30 UTC (rev 286644)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-08 07:27:20 UTC (rev 286645)
@@ -1,3 +1,18 @@
+2021-12-07 Myles C. Maxfield <[email protected]>
+
+ [MacCatalyst] Fix build after r286603
+ https://bugs.webkit.org/show_bug.cgi?id=233977
+
+ Unreviewed.
+
+ Previously, TARGET_OS_IOS and TARGET_OS_MACCATALYST were never on at the same time.
+ Now, they're on at the same time, and ANGLE doesn't expect that. This patch turns
+ off TARGET_OS_IOS when TARGET_OS_MACCATALYST is on, just to get ANGLE to build.
+ The long-term fix is to either update all the sites to use correct macros, or to
+ use the ANGLE_PLATFORM_* defines instead.
+
+ * src/common/platform.h:
+
2021-12-07 Yusuke Suzuki <[email protected]>
Unreviewed, these files are modified after building ANGLE
Modified: trunk/Source/ThirdParty/ANGLE/src/common/platform.h (286644 => 286645)
--- trunk/Source/ThirdParty/ANGLE/src/common/platform.h 2021-12-08 06:43:30 UTC (rev 286644)
+++ trunk/Source/ThirdParty/ANGLE/src/common/platform.h 2021-12-08 07:27:20 UTC (rev 286645)
@@ -132,6 +132,7 @@
# endif
# if TARGET_OS_MACCATALYST
# define ANGLE_PLATFORM_MACCATALYST 1
+# undef TARGET_OS_IOS
# endif
# endif
# // This might be useful globally. At the moment it is used
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
