Bug 214129 - Local internal builds fail on Apple Silicon (building yasm)
Summary: Local internal builds fail on Apple Silicon (building yasm)
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Tim Horton
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-07-09 05:03 PDT by Tim Horton
Modified: 2020-07-10 06:01 PDT (History)
4 users (show)

See Also:


Attachments
Patch (2.37 KB, patch)
2020-07-09 05:04 PDT, Tim Horton
no flags Details | Formatted Diff | Diff
Patch (2.36 KB, patch)
2020-07-09 10:41 PDT, Tim Horton
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tim Horton 2020-07-09 05:03:54 PDT
Local internal builds fail on Apple Silicon (building yasm)
Comment 1 Tim Horton 2020-07-09 05:04:20 PDT
Created attachment 403856 [details]
Patch
Comment 2 mitz 2020-07-09 06:48:57 PDT
Comment on attachment 403856 [details]
Patch

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

> Tools/Scripts/webkitdirs.pm:375
> +    if (isAppleCocoaWebKit() && $output eq "arm64") {

Could combine with the above into one `if (isAppleCocoaWebKit())` block.

> Tools/Scripts/webkitdirs.pm:376
> +        $output = determineXcodeSDK();

Why are we assigning an SDK identifier to `$output` (which appears to hold an architecture) here?
Comment 3 Tim Horton 2020-07-09 10:14:10 PDT
Comment on attachment 403856 [details]
Patch

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

>> Tools/Scripts/webkitdirs.pm:375
>> +    if (isAppleCocoaWebKit() && $output eq "arm64") {
> 
> Could combine with the above into one `if (isAppleCocoaWebKit())` block.

I intentionally did not because the above block will go away and this one won’t.

>> Tools/Scripts/webkitdirs.pm:376
>> +        $output = determineXcodeSDK();
> 
> Why are we assigning an SDK identifier to `$output` (which appears to hold an architecture) here?

Whoops! That was for debugging and I forgot to revert. Good catch.
Comment 4 Tim Horton 2020-07-09 10:41:47 PDT
Created attachment 403887 [details]
Patch
Comment 5 EWS 2020-07-09 11:30:05 PDT
Committed r264182: <https://trac.webkit.org/changeset/264182>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 403887 [details].
Comment 6 Radar WebKit Bug Importer 2020-07-09 11:31:14 PDT
<rdar://problem/65281288>
Comment 7 Jonathan Bedard 2020-07-10 06:01:49 PDT
Comment on attachment 403887 [details]
Patch

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

> Tools/Scripts/webkitdirs.pm:381
> +

We need to make sure that run-javascriptcore-tests will override arm64e with arm64. I think it already does, but I don’t have a checkout handy.