Title: [195174] trunk
- Revision
- 195174
- Author
- [email protected]
- Date
- 2016-01-16 12:50:22 -0800 (Sat, 16 Jan 2016)
Log 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 <[email protected]> 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 <[email protected]> on 2016-01-16
Reviewed by Michael Catanzaro.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (195173 => 195174)
--- trunk/ChangeLog 2016-01-16 20:37:25 UTC (rev 195173)
+++ trunk/ChangeLog 2016-01-16 20:50:22 UTC (rev 195174)
@@ -1,3 +1,13 @@
+2016-01-16 Jeremy Huddleston Sequoia <[email protected]>
+
+ [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 <[email protected]>
[CMake] Do not use LLVM static libraries for FTL JIT
Modified: trunk/Source/WebKit2/ChangeLog (195173 => 195174)
--- trunk/Source/WebKit2/ChangeLog 2016-01-16 20:37:25 UTC (rev 195173)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-16 20:50:22 UTC (rev 195174)
@@ -1,3 +1,12 @@
+2016-01-16 Jeremy Huddleston Sequoia <[email protected]>
+
+ 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 <[email protected]>
[iOS] Replace deprecated -[UIDocumentMenuViewController
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (195173 => 195174)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-01-16 20:37:25 UTC (rev 195173)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-01-16 20:50:22 UTC (rev 195174)
@@ -938,12 +938,6 @@
${WEBKIT2_DIR}/UIProcess/API/gtk/*.cpp
)
-# 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
DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
Modified: trunk/Source/cmake/OptionsGTK.cmake (195173 => 195174)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-01-16 20:37:25 UTC (rev 195173)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-01-16 20:50:22 UTC (rev 195174)
@@ -471,10 +471,11 @@
# 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. (--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)
endforeach ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
