Bug 233977

Summary: [MacCatalyst] Fix build after r286603
Product: WebKit Reporter: Myles C. Maxfield <mmaxfield>
Component: New BugsAssignee: Myles C. Maxfield <mmaxfield>
Status: RESOLVED FIXED    
Severity: Normal CC: darin, dino, ews-watchlist, kbr, kkinnunen, kondapallykalyan, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
See Also: https://bugs.webkit.org/show_bug.cgi?id=237113
Attachments:
Description Flags
Patch none

Description Myles C. Maxfield 2021-12-07 22:21:03 PST 
[MacCatalyst] Fix build after r286603
Comment 1 Myles C. Maxfield 2021-12-07 22:24:44 PST 
Created attachment 446300 [details]
Patch
Comment 2 EWS Watchlist 2021-12-07 22:25:30 PST 
Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 EWS 2021-12-07 23:28:34 PST 
Committed r286645 (244958@main): <https://commits.webkit.org/244958@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 446300 [details].
Comment 4 Radar WebKit Bug Importer 2021-12-07 23:29:20 PST 
<rdar://problem/86194597>
Comment 5 Darin Adler 2021-12-08 09:13:43 PST 
Comment on attachment 446300 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=446300&action=review

> Source/ThirdParty/ANGLE/src/common/platform.h:135
> +#            undef TARGET_OS_IOS

How is it safe to do this? Don’t system headers depend on how these macros are set? Setting them the way ANGLE code expects could fix ANGLE, but then break the system headers?

You said something about long-term fix, but doing it this way may work now, but seems like it could cause new problems at any time when Apple system headers are changed.
Comment 6 Myles C. Maxfield 2021-12-08 14:36:32 PST 
Comment on attachment 446300 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=446300&action=review

>> Source/ThirdParty/ANGLE/src/common/platform.h:135
>> +#            undef TARGET_OS_IOS
> 
> How is it safe to do this? Don’t system headers depend on how these macros are set? Setting them the way ANGLE code expects could fix ANGLE, but then break the system headers?
> 
> You said something about long-term fix, but doing it this way may work now, but seems like it could cause new problems at any time when Apple system headers are changed.

Yes, you’re absolutely right, and I’m working with Kyle to get this fixed properly as soon as we can. This patch is just to allow developers to continue developing rather than hitting a 100% repro build failure.