Changeset 249178 in webkit

Timestamp:

Aug 27, 2019, 3:29:45 PM (7 years ago)

Author:

Adrian Perez de Castro

Message:

Merged r248954 - [GTK][WPE] Gtk-Doc fails with build options which need cooperation between CFLAGS and LDFLAGS
​https://bugs.webkit.org/show_bug.cgi?id=200987

Reviewed by Philippe Normand.

Only CFLAGS was being set before trying to generate the documentation
but not LDFLAGS, which could cause errors when gtk-doc tries to link
a generated program when the compiler flags would also require usage
of certain linker flags later on.

• Source/cmake/GtkDoc.cmake: Also set LDFLAGS in the environment when

invoking Tools/gtkdoc/generate-gtkdoc.

Location:

releases/WebKitGTK/webkit-2.24

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/GtkDoc.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/ChangeLog

@@ +1 @@
+2019-08-21  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Gtk-Doc fails with build options which need cooperation between CFLAGS and LDFLAGS
+        https://bugs.webkit.org/show_bug.cgi?id=200987
+
+        Reviewed by Philippe Normand.
+
+        Only CFLAGS was being set before trying to generate the documentation
+        but not LDFLAGS, which could cause errors when gtk-doc tries to link
+        a generated program when the compiler flags would also require usage
+        of certain linker flags later on.
+
+        * Source/cmake/GtkDoc.cmake: Also set LDFLAGS in the environment when
+        invoking Tools/gtkdoc/generate-gtkdoc.
+
 2019-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/cmake/GtkDoc.cmake

@@ -5 +5 @@
         OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
         DEPENDS ${DocumentationDependencies}
-        COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
+        COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
         COMMAND touch ${_stamp_name}
         WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"