Title: [252827] trunk/Tools
- Revision
- 252827
- Author
- [email protected]
- Date
- 2019-11-22 21:37:46 -0800 (Fri, 22 Nov 2019)
Log Message
Set 64-bit as default architecture on Windows
https://bugs.webkit.org/show_bug.cgi?id=204477
Reviewed by Ross Kirsling.
This will make 64-bit building and testing the default.
* Scripts/webkitdirs.pm:
(determineIsWin64):
* Scripts/webkitpy/port/win.py:
(WinPort):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (252826 => 252827)
--- trunk/Tools/ChangeLog 2019-11-23 04:52:19 UTC (rev 252826)
+++ trunk/Tools/ChangeLog 2019-11-23 05:37:46 UTC (rev 252827)
@@ -1,3 +1,17 @@
+2019-11-22 Per Arne Vollan <[email protected]>
+
+ Set 64-bit as default architecture on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=204477
+
+ Reviewed by Ross Kirsling.
+
+ This will make 64-bit building and testing the default.
+
+ * Scripts/webkitdirs.pm:
+ (determineIsWin64):
+ * Scripts/webkitpy/port/win.py:
+ (WinPort):
+
2019-11-22 Jonathan Bedard <[email protected]>
run-_javascript_core-tests: Failure to determine configuration for reporting is fatal
Modified: trunk/Tools/Scripts/webkitdirs.pm (252826 => 252827)
--- trunk/Tools/Scripts/webkitdirs.pm 2019-11-23 04:52:19 UTC (rev 252826)
+++ trunk/Tools/Scripts/webkitdirs.pm 2019-11-23 05:37:46 UTC (rev 252827)
@@ -495,7 +495,6 @@
push(@args, '--maccatalyst') if (defined $xcodeSDK && $xcodeSDK =~ /^maccatalyst/);
push(@args, '--32-bit') if ($architecture eq "x86" and !isWin64());
push(@args, '--64-bit') if (isWin64());
- push(@args, '--64-bit') if (isFTW());
push(@args, '--ftw') if isFTW();
push(@args, '--gtk') if isGtk();
push(@args, '--wpe') if isWPE();
@@ -1292,7 +1291,7 @@
sub determineIsWin64()
{
return if defined($isWin64);
- $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isFTW() || isWinCairo() || isJSCOnly()) && !shouldBuild32Bit());
+ $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isAnyWindows() || isJSCOnly()) && !shouldBuild32Bit());
}
sub determineIsWin64FromArchitecture($)
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (252826 => 252827)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2019-11-23 04:52:19 UTC (rev 252826)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2019-11-23 05:37:46 UTC (rev 252827)
@@ -62,6 +62,8 @@
ARCHITECTURES = ['x86', 'x86_64']
+ DEFAULT_ARCHITECTURE = 'x86_64'
+
CRASH_LOG_PREFIX = "CrashLog"
if sys.platform.startswith('win'):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
