Changeset 272732 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

Feb 11, 2021, 8:58:24 AM (4 years ago)

Author:

[email protected]

Message:

[CMake] WEBKIT_EXECUTABLE can incorrectly link framework
​https://bugs.webkit.org/show_bug.cgi?id=221703

Reviewed by Michael Catanzaro.

.:

After r272484 which added an additional test for TestJavaScriptCore the PlayStation build
began failing with an unresolved symbol in bmalloc. On PlayStation both WTF and bmalloc
are linked into JavaScriptCore. That library was building successfully which implied that
WTF was being erroniously linked into TestJavaScriptCore.

Inside _WEBKIT_EXECUTABLE_LINK_FRAMEWORK there was an invalid conditional which was causing
WTF to be linked. Fixed the logic to ensure that if the requested framework is linked into
another framework that is being linked then it is not added to the linker.

• Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

GTK compiles JavaScriptCore as a SHARED library but the symbols from WTF are not being
properly exposed from it. Workaround this by linking WTF directly until GTK turns on
hidden visibility and properly exports symbols.

• shell/PlatformGTK.cmake:

Tools:

GTK compiles JavaScriptCore as a SHARED library but the symbols from WTF are not being
properly exposed from it. Workaround this by linking WTF directly until GTK turns on
hidden visibility and properly exports symbols.

• TestWebKitAPI/CMakeLists.txt:
• TestWebKitAPI/PlatformGTK.cmake:

File:

• trunk/Source/JavaScriptCore/shell/PlatformGTK.cmake (modified) (1 diff)

trunk/Source/JavaScriptCore/shell/PlatformGTK.cmake

@@ -2 +2 @@
     ${GLIB_LIBRARIES}
 )
+
+# FIXME: Remove when turning on hidden visibility https://bugs.webkit.org/show_bug.cgi?id=181916
+list(APPEND jsc_LIBRARIES WTF)
+list(APPEND testapi_LIBRARIES  WTF)
+list(APPEND testmasm_LIBRARIES WTF)
+list(APPEND testb3_LIBRARIES WTF)