Attachment 370507 Details for Bug 198098 – Patch

[patch] Patch

198098.2.diff (text/plain), 2.69 KB, created by Stephan Szabo on 2019-05-23 09:58:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Szabo

Created: 2019-05-23 09:58:52 PDT

Size: 2.69 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f44dc9ee894..357fe6458a5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-05-22  Stephan Szabo  <stephan.szabo@sony.com>
>+
>+        [Win][CMake] Pass architecture to cmake via -A for both x64 and Win32
>+        https://bugs.webkit.org/show_bug.cgi?id=198098
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        With current CMake and Visual Studio 2019, the default
>+        architecture will match the host, so we should make sure
>+        to explicitly mention the architecture we want for 32-bit
>+        builds as well for cases where we are on x64 and not in an
>+        x64_x32 cross-build vcvars environment.
>+
>+        * Scripts/webkitdirs.pm:
>+        (getVisualStudioToolset): Get toolset name for cmake/msbuild
>+        (getMSBuildPlatformArgument): Update to use getVisualStudioToolset
>+        (getCMakeWindowsToolsetArgument): Get -A argument for cmake
>+        based on toolset
>+        (generateBuildSystemFromCMakeProject): Remove explicit -A x64
>+        in 64-bit mode in favor of new getCMakeWindowsToolsetArgument.
>+
> 2019-05-21  Chris Dumez  <cdumez@apple.com>
> 
>         [PSON] Assertion hit when navigating back after a process swap forced by the client
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index fb0ef50104f..67cc17a6b11 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -1873,15 +1873,33 @@ sub buildXCodeProject($$@)
>     return system "xcodebuild", "-project", "$project.xcodeproj", @extraOptions;
> }
> 
>-sub getMSBuildPlatformArgument()
>+sub getVisualStudioToolset()
> {
>     if (isPlayStation()) {
>         return "";
>     } elsif (isWin64()) {
>-        return "/p:Platform=x64";
>+        return "x64";
>     } else {
>-        return "/p:Platform=Win32";
>+        return "Win32";
>+    }
>+}
>+
>+sub getMSBuildPlatformArgument()
>+{
>+    my $toolset = getVisualStudioToolset();
>+    if (defined($toolset) && length($toolset)) {
>+        return "/p:Platform=$toolset";
>     }
>+    return "";
>+}
>+
>+sub getCMakeWindowsToolsetArgument()
>+{
>+    my $toolset = getVisualStudioToolset();
>+    if (defined($toolset) && length($toolset)) {
>+        return "-A $toolset";
>+    }
>+    return "";
> }
> 
> sub buildVisualStudioProject
>@@ -2197,8 +2215,8 @@ sub generateBuildSystemFromCMakeProject
>         }
>         push @args, "-DUSE_THIN_ARCHIVES=OFF" if isPlayStation();
>     } else {
>-        if (isAnyWindows() && isWin64()) {
>-            push @args, '-A x64';
>+        if (isAnyWindows()) {
>+            push @args, getCMakeWindowsToolsetArgument();
>         }
>         if ((isAnyWindows() || isPlayStation()) && defined $ENV{VisualStudioVersion}) {
>             my $var = int($ENV{VisualStudioVersion});

Actions: View | Formatted Diff | Diff

Attachments on bug 198098: 370408 | 370429 | 370458 | 370507