Attachment 343890 Details for Bug 187127 – Patch

[patch] Patch

bug187127.patch (text/plain), 3.99 KB, created by Ross Kirsling on 2018-06-28 20:34:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-06-28 20:34:03 PDT

Size: 3.99 KB

patch

obsolete

>diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
>index aa307cd827d726d5e18c39c1de91be90e315118c..13b5cc2deeb1cd3923126b9844a9bb733a65d48b 100644
>--- a/Source/cmake/OptionsJSCOnly.cmake
>+++ b/Source/cmake/OptionsJSCOnly.cmake
>@@ -73,8 +71,9 @@ if (WIN32)
>         set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
>         set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
>
>+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
>         set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
>-        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
>+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin64)
>     endif ()
>
>     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
>@@ -100,6 +99,9 @@ if (NOT APPLE)
>     if (NOT WTF_OS_FUCHSIA)
>         # TODO: Add ICU on Fuchsia.
>         find_package(ICU REQUIRED)
>+        if (WIN32)
>+            add_definitions(-DUCHAR_TYPE=wchar_t)
>+        endif ()
>     endif ()
> else ()
>     add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b476c655c62986955a3578492a3d8dc78f1ff284..42077690b725a5f711f9bf1b709e2123d6daaa6c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-06-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [JSCOnly] Restore Windows build.
>+        https://bugs.webkit.org/show_bug.cgi?id=187127
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * Scripts/build-jsc:
>+        Fix condition for disabling FTL JIT on Windows.
>+
>+        * Scripts/webkitdirs.pm:
>+        (executableProductDir):
>+        JSCOnly should still use bin64 on Windows (for consistency with full WebKit build).
>+        (determineIsWin64):
>+        JSCOnly already defaults to 64-bit on Windows with Ninja -- ensure that this is true even with MSBuild.
>+
> 2018-06-28  Daniel Bates  <dabates@apple.com>
>
>         Fix the iOS build following r233299
>diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc
>index 27e8b1326c8d5884f2f17dcc6e159b66b6fd88aa..f1def2ad915b0a61300da0d4822c88917bad7d7d 100755
>--- a/Tools/Scripts/build-jsc
>+++ b/Tools/Scripts/build-jsc
>@@ -115,7 +115,7 @@ if ($showHelp) {
>    exit 1;
> }
>
>-if (isAppleWinWebKit()) {
>+if (isAnyWindows()) {
>     $ftlJIT = 0;
> }
>
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index 909218a204435a7cccdebd671916f3f91ba70b1d..ebbe65fd854638b89e184ef25c24e214e56aa1fb 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -815,10 +815,10 @@ sub executableProductDir
>     my $productDirectory = productDir();
>
>     my $binaryDirectory;
>-    if (isGtk() || isJSCOnly() || isWPE()) {
>-        $binaryDirectory = "bin";
>-    } elsif (isAnyWindows()) {
>+    if (isAnyWindows()) {
>         $binaryDirectory = isWin64() ? "bin64" : "bin32";
>+    } elsif (isGtk() || isJSCOnly() || isWPE()) {
>+        $binaryDirectory = "bin";
>     } else {
>         return $productDirectory;
>     }
>@@ -1296,7 +1296,7 @@ sub isWin64()
> sub determineIsWin64()
> {
>     return if defined($isWin64);
>-    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || isWinCairo() && !shouldBuild32Bit();
>+    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isWinCairo() || isJSCOnly()) && !shouldBuild32Bit());
> }
>
> sub determineIsWin64FromArchitecture($)
>diff --git a/ChangeLog b/ChangeLog
>index a3fc58d0118e675009253ce206bacc701640ade9..8a76a327f0084f65193c656674d812249707d01f 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [JSCOnly] Restore Windows build.
>+        https://bugs.webkit.org/show_bug.cgi?id=187127
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * Source/cmake/OptionsJSCOnly.cmake:
>+        Don't forget to set -DUCHAR_TYPE=wchar_t for ICU on Windows.
>+        Use bin64/lib64 on Windows (for consistency with full WebKit build).
>+
> 2018-06-28  Adam Barth  <abarth@webkit.org>
>
>         Switch OS(FUCHSIA) to using JSCOnly

Actions: View | Formatted Diff | Diff

Attachments on bug 187127: 343821 | 343822 | 343838 | 343890 | 343892