Changeset 264182 in webkit

Timestamp:

Jul 9, 2020, 11:29:59 AM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Local internal builds fail on Apple Silicon (building yasm)
​https://bugs.webkit.org/show_bug.cgi?id=214129

Reviewed by Dan Bernstein.

• Scripts/webkitdirs.pm:

(determineNativeArchitecture):
Build for arm64e when building with the internal SDK.
Importantly, this matches the ARCHS_STANDARD_* build settings, so this way we
won't set an ARCH that isn't in VALID_ARCHS for projects who use ARCHS_STANDARD_*.

(determineXcodeSDK):
Fall back to "macosx", so that other code can correctly identify that we're building for macOS.
This logic needs to be here, instead of in the caller (who could assume undefined means macOS),
because we want the ".internal" search to take place as well.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-09  Tim Horton  <timothy_horton@apple.com>
+
+        Local internal builds fail on Apple Silicon (building yasm)
+        https://bugs.webkit.org/show_bug.cgi?id=214129
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitdirs.pm:
+        (determineNativeArchitecture):
+        Build for arm64e when building with the internal SDK.
+        Importantly, this matches the ARCHS_STANDARD_* build settings, so this way we
+        won't set an ARCH that isn't in VALID_ARCHS for projects who use ARCHS_STANDARD_*.
+
+        (determineXcodeSDK):
+        Fall back to "macosx", so that other code can correctly identify that we're building for macOS.
+        This logic needs to be here, instead of in the caller (who could assume undefined means macOS),
+        because we want the ".internal" search to take place as well.
+
 2020-07-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -372 +372 @@
         $output = "arm64";
     }
+
+    if (isAppleCocoaWebKit() && $output eq "arm64") {
+        determineXcodeSDK();
+        if ($xcodeSDK eq "macosx.internal") {
+            $output = "arm64e";
+        }
+    }
+
     $output = "arm" if $output eq "armv7l";
-    die "'arm64e' is an invalid native architecture" if $output eq "arm64e";
     $nativeArchitectureMap{"$target:$port"} = $output;
 }
@@ -633 +640 @@
         $xcodeSDK ||= "maccatalyst";
     }
-    return if !defined $xcodeSDK;
+
+    # Finally, fall back to macOS if no platform is specified.
+    if (!defined $xcodeSDK) {
+        $xcodeSDK = "macosx";
+    }
     
     # Prefer the internal version of an sdk, if it exists.