Title: [274010] trunk
Revision
274010
Author
[email protected]
Date
2021-03-05 14:56:54 -0800 (Fri, 05 Mar 2021)

Log Message

[GTK] Remove ADD_WHOLE_ARCHIVE_TO_LIBRARIES
https://bugs.webkit.org/show_bug.cgi?id=222826

Patch by Michael Catanzaro <[email protected]> on 2021-03-05
Reviewed by Don Olmstead.

.:

I don't know why it's no longer needed, but GTK links without it, so it can go away.

* Source/cmake/OptionsGTK.cmake:

Tools:

* TestWebKitAPI/PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (274009 => 274010)


--- trunk/ChangeLog	2021-03-05 22:34:17 UTC (rev 274009)
+++ trunk/ChangeLog	2021-03-05 22:56:54 UTC (rev 274010)
@@ -1,3 +1,14 @@
+2021-03-05  Michael Catanzaro  <[email protected]>
+
+        [GTK] Remove ADD_WHOLE_ARCHIVE_TO_LIBRARIES
+        https://bugs.webkit.org/show_bug.cgi?id=222826
+
+        Reviewed by Don Olmstead.
+
+        I don't know why it's no longer needed, but GTK links without it, so it can go away.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2021-03-05  Don Olmstead  <[email protected]>
 
         [CMake] Bump cmake_minimum_required version to 3.12 or later

Modified: trunk/Source/cmake/OptionsGTK.cmake (274009 => 274010)


--- trunk/Source/cmake/OptionsGTK.cmake	2021-03-05 22:34:17 UTC (rev 274009)
+++ trunk/Source/cmake/OptionsGTK.cmake	2021-03-05 22:56:54 UTC (rev 274010)
@@ -453,25 +453,5 @@
     endif ()
 endmacro()
 
-# CMake does not automatically add --whole-archive when building shared objects from
-# a list of convenience libraries. This can lead to missing symbols in the final output.
-# We add --whole-archive to all libraries manually to prevent the linker from trimming
-# symbols that we actually need later. With ld64 on darwin, we use -all_load instead.
-macro(ADD_WHOLE_ARCHIVE_TO_LIBRARIES _list_name)
-    if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-        list(APPEND ${_list_name} -Wl,-all_load)
-    else ()
-        set(_tmp)
-        foreach (item IN LISTS ${_list_name})
-            if ("${item}" STREQUAL "PRIVATE" OR "${item}" STREQUAL "PUBLIC")
-                list(APPEND _tmp "${item}")
-            else ()
-                list(APPEND _tmp -Wl,--whole-archive "${item}" -Wl,--no-whole-archive)
-            endif ()
-        endforeach ()
-        set(${_list_name} ${_tmp})
-    endif ()
-endmacro()
-
 include(BubblewrapSandboxChecks)
 include(GStreamerChecks)

Modified: trunk/Tools/ChangeLog (274009 => 274010)


--- trunk/Tools/ChangeLog	2021-03-05 22:34:17 UTC (rev 274009)
+++ trunk/Tools/ChangeLog	2021-03-05 22:56:54 UTC (rev 274010)
@@ -1,3 +1,12 @@
+2021-03-05  Michael Catanzaro  <[email protected]>
+
+        [GTK] Remove ADD_WHOLE_ARCHIVE_TO_LIBRARIES
+        https://bugs.webkit.org/show_bug.cgi?id=222826
+
+        Reviewed by Don Olmstead.
+
+        * TestWebKitAPI/PlatformGTK.cmake:
+
 2021-03-05  Jonathan Bedard  <[email protected]>
 
         [webkitscmpy] Standardize timezone of mock svn server (Follow-up)

Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (274009 => 274010)


--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2021-03-05 22:34:17 UTC (rev 274009)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2021-03-05 22:56:54 UTC (rev 274010)
@@ -54,7 +54,6 @@
 list(APPEND TestWebCore_LIBRARIES
     GTK::GTK
 )
-ADD_WHOLE_ARCHIVE_TO_LIBRARIES(TestWebCore_LIBRARIES)
 
 # TestWebKit
 list(APPEND TestWebKit_SOURCES
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to