Changeset 195174 in webkit

Timestamp:

Jan 16, 2016 12:50:22 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

.:
[GTK] Use -Wl,-all_load on darwin to include contents of all static archives

​https://bugs.webkit.org/show_bug.cgi?id=153117

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-01-16
Reviewed by Michael Catanzaro.

• Source/cmake/OptionsGTK.cmake:

Source/WebKit2:
Remove a now-irrelevant darwin build hack
​https://bugs.webkit.org/show_bug.cgi?id=153117

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-01-16
Reviewed by Michael Catanzaro.

• PlatformGTK.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-01-16  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        [GTK] Use -Wl,-all_load on darwin to include contents of all static archives
+
+        https://bugs.webkit.org/show_bug.cgi?id=153117
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2016-01-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-16  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        Remove a now-irrelevant darwin build hack
+        https://bugs.webkit.org/show_bug.cgi?id=153117
+
+        Reviewed by Michael Catanzaro.
+
+        * PlatformGTK.cmake:
+
 2016-01-16  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -939 +939 @@
 )
 
-# Manually add some libraries on OSX because we don't have the --whole-archive flag
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    set(INTROSPECTION_ADDITIONAL_LIBRARIES --library=c++)
-    set(INTROSPECTION_ADDITIONAL_LDFLAGS -lGObjectDOMBindings)
-endif ()
-
 add_custom_command(
     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir

trunk/Source/cmake/OptionsGTK.cmake

@@ -472 +472 @@
 # 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. (--whole-archive isn't an option on XCode's
-# linker, though.)
+# symbols that we actually need later. With ld64 on darwin, we use -all_load instead.
 macro(ADD_WHOLE_ARCHIVE_TO_LIBRARIES _list_name)
-    if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        list(APPEND ${_list_name} -Wl,-all_load)
+    else ()
         foreach (library IN LISTS ${_list_name})
           list(APPEND ${_list_name}_TMP -Wl,--whole-archive ${library} -Wl,--no-whole-archive)