Title: [264182] trunk/Tools
- Revision
- 264182
- Author
- [email protected]
- Date
- 2020-07-09 11:29:59 -0700 (Thu, 09 Jul 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (264181 => 264182)
--- trunk/Tools/ChangeLog 2020-07-09 18:21:38 UTC (rev 264181)
+++ trunk/Tools/ChangeLog 2020-07-09 18:29:59 UTC (rev 264182)
@@ -1,3 +1,21 @@
+2020-07-09 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
[iOS] Occasional crash under -[UIView _setViewDelegate:] when presenting date and time pickers
Modified: trunk/Tools/Scripts/webkitdirs.pm (264181 => 264182)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-07-09 18:21:38 UTC (rev 264181)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-07-09 18:29:59 UTC (rev 264182)
@@ -371,8 +371,15 @@
if (isAppleCocoaWebKit() && $output ne "x86_64") {
$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;
}
@@ -632,7 +639,11 @@
if (checkForArgumentAndRemoveFromARGV("--maccatalyst")) {
$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.
my @availableSDKs = availableXcodeSDKs();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
