Title: [264605] trunk/Tools
Revision
264605
Author
[email protected]
Date
2020-07-20 11:12:49 -0700 (Mon, 20 Jul 2020)

Log Message

[webkitpy] Build with arm64e when on Apple Internal
https://bugs.webkit.org/show_bug.cgi?id=214553
<rdar://problem/65745597>

Reviewed by Tim Horton.

* Scripts/webkitpy/port/mac.py:
(MacPort._build_driver_flags): Use arm64e instead of arm64 for Internal builds.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (264604 => 264605)


--- trunk/Tools/ChangeLog	2020-07-20 16:58:12 UTC (rev 264604)
+++ trunk/Tools/ChangeLog	2020-07-20 18:12:49 UTC (rev 264605)
@@ -1,3 +1,14 @@
+2020-07-20  Jonathan Bedard  <[email protected]>
+
+        [webkitpy] Build with arm64e when on Apple Internal
+        https://bugs.webkit.org/show_bug.cgi?id=214553
+        <rdar://problem/65745597>
+
+        Reviewed by Tim Horton.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort._build_driver_flags): Use arm64e instead of arm64 for Internal builds.
+
 2020-07-20  Alex Christensen  <[email protected]>
 
         Add lock icon to MiniBrowser

Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (264604 => 264605)


--- trunk/Tools/Scripts/webkitpy/port/mac.py	2020-07-20 16:58:12 UTC (rev 264604)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py	2020-07-20 18:12:49 UTC (rev 264605)
@@ -74,7 +74,13 @@
         return result
 
     def _build_driver_flags(self):
-        return ['ARCHS=i386'] if self.architecture() == 'x86' else ['ARCHS={}'.format(self.architecture())]
+        architecture = self.architecture()
+        # The Internal SDK should always prefer arm64e binaries to arm64 ones
+        if architecture == 'arm64' and apple_additions():
+            architecture = 'arm64e'
+        if architecture == 'x86':
+            return ['ARCHS=i386']
+        return ['ARCHS={}'.format(architecture)]
 
     def default_baseline_search_path(self, **kwargs):
         versions_to_fallback = []
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to