Attachment #367756 for bug #196866

View Details Raw Unified Return to Bug 196866



2019-04-18  Ross Kirsling  <ross.kirsling@sony.com>

        [WinCairo] Non-unified build fails to link Tools
        https://bugs.webkit.org/show_bug.cgi?id=196866

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        Drive-by fix -- don't disable string pooling when building WebCoreTestSupport.
        (This should have been part of r235203.)

2019-04-18  Shawn Roberts  <sroberts@apple.com>

        Unreviewed manual rollout of r244248 and r244409

Lines 2105-2111 target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES}) a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt -1 / +1 lines
2105	if (WebCoreTestSupport_OUTPUT_NAME)	2105	if (WebCoreTestSupport_OUTPUT_NAME)
2106	set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})	2106	set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
2107	if (MSVC)	2107	if (MSVC)
2108	add_compile_options(/GF- /WX-)	2108	add_compile_options(/WX-)
2109	endif ()	2109	endif ()
2110	endif ()	2110	endif ()
2111		2111

Lines 156-161 set(WTF_LIBRARY_TYPE SHARED) a/Source/cmake/OptionsWin.cmake_sec1
- a/Source/cmake/OptionsWin.cmake +4 lines
156	set(PAL_LIBRARY_TYPE STATIC)	156	set(PAL_LIBRARY_TYPE STATIC)
157	set(WebKitLegacy_LIBRARY_TYPE SHARED)	157	set(WebKitLegacy_LIBRARY_TYPE SHARED)
158		158
		159	if (NOT ENABLE_UNIFIED_BUILDS AND WebCore_LIBRARY_TYPE MATCHES STATIC)
		160	set(WebCore_LIBRARY_TYPE OBJECT)
		161	endif ()
		162
159	find_package(ICU REQUIRED)	163	find_package(ICU REQUIRED)
160		164
161	# If <winsock2.h> is not included before <windows.h> redefinition errors occur	165	# If <winsock2.h> is not included before <windows.h> redefinition errors occur



2019-04-18  Ross Kirsling  <ross.kirsling@sony.com>

        [WinCairo] Non-unified build fails to link Tools
        https://bugs.webkit.org/show_bug.cgi?id=196866

        Reviewed by NOBODY (OOPS!).

        * Source/cmake/OptionsWin.cmake:
        Build WebCore as an object library when unified builds are disabled
        (and we haven't explicitly asked to build it as a shared library).
        This is necessary for two reasons:
        - Non-unified WebCore.lib is too large for the MSVC linker to create (>4GB).
        - Some WebCore object files are not actually used, but DumpRenderTree and TestRunnerInjectedBundle
          still expect that their symbols will be re-exported via WebKit[Legacy].

2019-04-17  Jer Noble  <jer.noble@apple.com>

        Automatically use ccache when available for Makefile builds

Return to Bug 196866

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +11 lines
		1	2019-04-18 Ross Kirsling <ross.kirsling@sony.com>
		2
		3	[WinCairo] Non-unified build fails to link Tools
		4	https://bugs.webkit.org/show_bug.cgi?id=196866
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	Drive-by fix -- don't disable string pooling when building WebCoreTestSupport.
		10	(This should have been part of r235203.)
		11
1	2019-04-18 Shawn Roberts <sroberts@apple.com>	12	2019-04-18 Shawn Roberts <sroberts@apple.com>
2		13
3	Unreviewed manual rollout of r244248 and r244409	14	Unreviewed manual rollout of r244248 and r244409

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +15 lines
		1	2019-04-18 Ross Kirsling <ross.kirsling@sony.com>
		2
		3	[WinCairo] Non-unified build fails to link Tools
		4	https://bugs.webkit.org/show_bug.cgi?id=196866
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Source/cmake/OptionsWin.cmake:
		9	Build WebCore as an object library when unified builds are disabled
		10	(and we haven't explicitly asked to build it as a shared library).
		11	This is necessary for two reasons:
		12	- Non-unified WebCore.lib is too large for the MSVC linker to create (>4GB).
		13	- Some WebCore object files are not actually used, but DumpRenderTree and TestRunnerInjectedBundle
		14	still expect that their symbols will be re-exported via WebKit[Legacy].
		15
1	2019-04-17 Jer Noble <jer.noble@apple.com>	16	2019-04-17 Jer Noble <jer.noble@apple.com>
2		17
3	Automatically use ccache when available for Makefile builds	18	Automatically use ccache when available for Makefile builds