Title: [264416] trunk/Tools
- Revision
- 264416
- Author
- jbed...@apple.com
- Date
- 2020-07-15 13:03:17 -0700 (Wed, 15 Jul 2020)
Log Message
[run-_javascript_core-tests] nativeArchitecture should never be arm64e
https://bugs.webkit.org/show_bug.cgi?id=214369
<rdar://problem/65364995>
Reviewed by Tim Horton.
* Scripts/webkitdirs.pm:
(determineNativeArchitecture):
(determineArchitecture):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (264415 => 264416)
--- trunk/Tools/ChangeLog 2020-07-15 20:01:53 UTC (rev 264415)
+++ trunk/Tools/ChangeLog 2020-07-15 20:03:17 UTC (rev 264416)
@@ -1,3 +1,15 @@
+2020-07-15 Jonathan Bedard <jbed...@apple.com>
+
+ [run-_javascript_core-tests] nativeArchitecture should never be arm64e
+ https://bugs.webkit.org/show_bug.cgi?id=214369
+ <rdar://problem/65364995>
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitdirs.pm:
+ (determineNativeArchitecture):
+ (determineArchitecture):
+
2020-07-15 Ryan Haddad <ryanhad...@apple.com>
Flaky API Test: TestWebKitAPI.SleepDisabler.NavigateBack
Modified: trunk/Tools/Scripts/webkitdirs.pm (264415 => 264416)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-07-15 20:01:53 UTC (rev 264415)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-07-15 20:03:17 UTC (rev 264416)
@@ -372,13 +372,6 @@
$output = "arm64";
}
- if (isAppleCocoaWebKit() && $output eq "arm64") {
- determineXcodeSDK();
- if ($xcodeSDK eq "macosx.internal") {
- $output = "arm64e";
- }
- }
-
$output = "arm" if $output eq "armv7l";
$nativeArchitectureMap{"$target:$port"} = $output;
}
@@ -389,6 +382,12 @@
determineBaseProductDir();
$architecture = nativeArchitecture();
+ if (isAppleCocoaWebKit() && $architecture eq "arm64") {
+ determineXcodeSDK();
+ if ($xcodeSDK eq "macosx.internal") {
+ $architecture = "arm64e";
+ }
+ }
if (isAppleCocoaWebKit()) {
determineXcodeSDK();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
