Title: [160799] trunk
Revision
160799
Author
g...@gnome.org
Date
2013-12-18 15:12:02 -0800 (Wed, 18 Dec 2013)

Log Message

[GTK][CMake] Use thin archives if building on Linux, only way to get non-shared-core debug builds
https://bugs.webkit.org/show_bug.cgi?id=125951

Reviewed by Martin Robinson.

* Source/cmake/OptionsGTK.cmake: append T for thin archives to the flags passed to ar,
also use u, which is used in the autotools build (it avoids adding a file twice).

Modified Paths

Diff

Modified: trunk/ChangeLog (160798 => 160799)


--- trunk/ChangeLog	2013-12-18 23:11:02 UTC (rev 160798)
+++ trunk/ChangeLog	2013-12-18 23:12:02 UTC (rev 160799)
@@ -1,5 +1,15 @@
 2013-12-18  Gustavo Noronha Silva  <g...@gnome.org>
 
+        [GTK][CMake] Use thin archives if building on Linux, only way to get non-shared-core debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=125951
+
+        Reviewed by Martin Robinson.
+
+        * Source/cmake/OptionsGTK.cmake: append T for thin archives to the flags passed to ar,
+        also use u, which is used in the autotools build (it avoids adding a file twice).
+
+2013-12-18  Gustavo Noronha Silva  <g...@gnome.org>
+
         [GTK][CMake] Remove binary size optimizations we do not use in the autotools build
         https://bugs.webkit.org/show_bug.cgi?id=125947
 

Modified: trunk/Source/cmake/OptionsGTK.cmake (160798 => 160799)


--- trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 23:11:02 UTC (rev 160798)
+++ trunk/Source/cmake/OptionsGTK.cmake	2013-12-18 23:12:02 UTC (rev 160799)
@@ -88,6 +88,13 @@
 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
 set(DATA_INSTALL_DIR "${DATADIR}/webkitgtk-3.0")
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+endif ()
+
 add_definitions(-DBUILDING_GTK__=1)
 add_definitions(-DGETTEXT_PACKAGE="WebKitGTK-3.0")
 add_definitions(-DDATA_DIR="${DATADIR}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to