Attachment 376517 Details for Bug 200820 – Patch

[patch] Patch

bug-200820-20190816124237.patch (text/plain), 1.56 KB, created by Ross Kirsling on 2019-08-16 12:42:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-08-16 12:42:38 PDT

Size: 1.56 KB

patch

obsolete

>Subversion Revision: 248783
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index dcb07d14d833ab4cb60b1d0d7bf3da43dc8a9553..07153eeba0ea9d61370ef42ae689c0389f5ff886 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -162,8 +162,13 @@ set(WTF_LIBRARY_TYPE SHARED)
> set(PAL_LIBRARY_TYPE STATIC)
> set(WebKitLegacy_LIBRARY_TYPE SHARED)
> 
>-if (NOT ENABLE_UNIFIED_BUILDS AND WebCore_LIBRARY_TYPE MATCHES STATIC)
>-    set(WebCore_LIBRARY_TYPE OBJECT)
>+if (NOT ENABLE_UNIFIED_BUILDS)
>+    if (WebCore_LIBRARY_TYPE MATCHES STATIC)
>+        set(WebCore_LIBRARY_TYPE OBJECT)
>+    endif ()
>+    if (WebCoreTestSupport_LIBRARY_TYPE MATCHES STATIC)
>+        set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)
>+    endif ()
> endif ()
> 
> # If <winsock2.h> is not included before <windows.h> redefinition errors occur
>diff --git a/ChangeLog b/ChangeLog
>index 98d285609cc823f22ad5c364f6e123f9bad4fdab..ef5db6e3b73820cb37f647c2dd03496ea5feb845 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-08-16  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [Win] WebCoreTestSupport is too big to link
>+        https://bugs.webkit.org/show_bug.cgi?id=200820
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsWin.cmake:
>+        As with WebCore itself, build WebCoreTestSupport as an object library when unified builds are disabled
>+        (and we haven't explicitly asked to build it as a shared library).
>+
> 2019-08-08  Brent Fulgham  <bfulgham@apple.com>
> 
>         [FTW] Get WebKit, WebKit2, and MiniBrowser building and executing

Actions: View | Formatted Diff | Diff

Attachments on bug 200820: 376517