Merge r221814 - Unreviewed WPE build fix.

* TestWebKitAPI/PlatformWPE.cmake: Link WebCore archives into the TestWebCore binary as a group.
WebKit · Oct 16, 2017 · 4d4b1d3 · 4d4b1d3
1 parent 7028475
commit 4d4b1d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed WPE build fix.
+
+        * TestWebKitAPI/PlatformWPE.cmake:
+        Link WebCore archives into the TestWebCore binary as a group.
+
 2017-09-07  Joseph Pecoraro  <pecoraro@apple.com>
 
         WebKit should claim that it can show responses for a broader range of JSON MIMETypes

diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
@@ -53,7 +53,7 @@ add_executable(TestWebCore
     ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
 )
 
-target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
+target_link_libraries(TestWebCore ${test_webcore_LIBRARIES} -Wl,--start-group WebCore WebCoreDerivedSources WebCorePlatformWPE -Wl,--end-group)
 add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
 
 add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)