run-javascriptcore-tests: Support Apple Silicon running x86 processes
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2020 14:22:05 +0000 (14:22 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2020 14:22:05 +0000 (14:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=213487
<rdar://problem/64606667>

Unreviewed infrastructure fix.

* Scripts/webkitdirs.pm:
(architecturesForProducts): Return architecutre(), not determineArchitecture().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263660 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index 237c9d8..184eb6e 100644 (file)
@@ -1,3 +1,14 @@
+2020-06-29  Jonathan Bedard  <jbedard@apple.com>
+
+        run-javascriptcore-tests: Support Apple Silicon running x86 processes
+        https://bugs.webkit.org/show_bug.cgi?id=213487
+        <rdar://problem/64606667>
+
+        Unreviewed infrastructure fix.
+
+        * Scripts/webkitdirs.pm:
+        (architecturesForProducts): Return architecutre(), not determineArchitecture().
+
 2020-06-29  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [webkitpy] PHP7.4 support on Debian platforms
index 2557699..54ec95b 100755 (executable)
@@ -843,7 +843,7 @@ sub architecturesForProducts
 {
     # Most ports don't have emulation, assume that the user gave us an accurate architecture
     if (!isAppleCocoaWebKit()) {
-        return determineArchitecture();
+        return architecture();
     }
     my $webkitBinary = File::Spec->catdir(executableProductDir(), "JavaScriptCore.framework", "JavaScriptCore");
     my $architectures = `/usr/bin/lipo -archs $webkitBinary`;