Changeset 295340 in webkit

Timestamp:

Jun 7, 2022, 4:42:55 AM (4 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r295034 - WebKitTestRunner shouldn't link object files of JavaScriptCore and WebCore
​https://bugs.webkit.org/show_bug.cgi?id=241002

Reviewed by Don Olmstead.

243269@main removed WebKit from WebKitTestRunner_FRAMEWORKS for
WPE. But, it should be there not to link object files of
JavaScriptCore and WebCore to WebKitTestRunner. In WPE builds,
JavaScriptCore and WebCore API are exported from WebKit shared
library. WebKit consumers shouldn't link with object files of
JavaScriptCore and WebCore.

However, adding WebKit to WebKitTestRunner_FRAMEWORKS introduced a
new problem that the object file of LowLevelInterpreter.cpp was linked
into WebKitTestRunner. This problem was fixed by changing
LowLevelInterpreterLib to a STATIC library.

• Source/JavaScriptCore/CMakeLists.txt:
• Tools/WebKitTestRunner/CMakeLists.txt:
• Tools/WebKitTestRunner/PlatformGTK.cmake:
• Tools/WebKitTestRunner/PlatformWin.cmake:

Canonical link: ​https://commits.webkit.org/251129@main

Location:

releases/WebKitGTK/webkit-2.36

Files:

• Source/JavaScriptCore/CMakeLists.txt (modified) (3 diffs)
• Tools/WebKitTestRunner/CMakeLists.txt (modified) (1 diff)
• Tools/WebKitTestRunner/PlatformGTK.cmake (modified) (1 diff)
• Tools/WebKitTestRunner/PlatformWin.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.36/Source/JavaScriptCore/CMakeLists.txt

@@ -457 +457 @@
         VERBATIM)
     list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)
+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
 else ()
     # As there's poor toolchain support for using `.file` directives in
@@ -466 +466 @@
     # and cmake doesn't allow us to introduce a compiler wrapper for a
     # single source file, so we need to create a separate target for it.
-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
         ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
 endif ()
@@ -1497 +1497 @@
 endif ()
 
-# When building JavaScriptCore as an object library, we need to make sure the
-# lowlevelinterpreter lib objects get propogated.
-if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
-    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
-else ()
-    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
-endif ()
+list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
 
 WEBKIT_COMPUTE_SOURCES(JavaScriptCore)

releases/WebKitGTK/webkit-2.36/Tools/WebKitTestRunner/CMakeLists.txt

@@ -27 +27 @@
     WebCore
     WebCoreTestSupport
+    WebKit
 )
 

releases/WebKitGTK/webkit-2.36/Tools/WebKitTestRunner/PlatformGTK.cmake

@@ -36 +36 @@
 )
 
-list(APPEND WebKitTestRunner_FRAMEWORKS
-    WebKit
-)
-
 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
     InjectedBundle/atk/AccessibilityControllerAtk.cpp

releases/WebKitGTK/webkit-2.36/Tools/WebKitTestRunner/PlatformWin.cmake

@@ -31 +31 @@
 )
 
-list(APPEND WebKitTestRunner_FRAMEWORKS
-    WebKit
-)
-
 list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
     $<TARGET_OBJECTS:WebCoreTestSupport>