Title: [290312] trunk/Source
Revision
290312
Author
[email protected]
Date
2022-02-22 09:42:04 -0800 (Tue, 22 Feb 2022)

Log Message

When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
https://bugs.webkit.org/show_bug.cgi?id=232936

Patch by Alexander Kanavin <[email protected]> on 2022-02-22
Reviewed by Michael Catanzaro.

g-ir-compiler is using a C compiler internally, so it needs to set
the proper flags for it.

* PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (290311 => 290312)


--- trunk/Source/_javascript_Core/ChangeLog	2022-02-22 17:11:49 UTC (rev 290311)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-22 17:42:04 UTC (rev 290312)
@@ -1,3 +1,15 @@
+2022-02-22  Alexander Kanavin  <[email protected]>
+
+        When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
+        https://bugs.webkit.org/show_bug.cgi?id=232936
+
+        Reviewed by Michael Catanzaro.
+
+        g-ir-compiler is using a C compiler internally, so it needs to set
+        the proper flags for it.
+
+        * PlatformGTK.cmake:
+
 2022-02-22  Asumu Takikawa  <[email protected]>
 
         Initial support for Wasm/ESM-integration in the WebCore module loader

Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (290311 => 290312)


--- trunk/Source/_javascript_Core/PlatformGTK.cmake	2022-02-22 17:11:49 UTC (rev 290311)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake	2022-02-22 17:42:04 UTC (rev 290312)
@@ -71,7 +71,7 @@
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
         DEPENDS _javascript_Core
-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
+        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
             ${INTROSPECTION_SCANNER}
             --quiet

Modified: trunk/Source/WebKit/ChangeLog (290311 => 290312)


--- trunk/Source/WebKit/ChangeLog	2022-02-22 17:11:49 UTC (rev 290311)
+++ trunk/Source/WebKit/ChangeLog	2022-02-22 17:42:04 UTC (rev 290312)
@@ -1,3 +1,15 @@
+2022-02-22  Alexander Kanavin  <[email protected]>
+
+        When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
+        https://bugs.webkit.org/show_bug.cgi?id=232936
+
+        Reviewed by Michael Catanzaro.
+
+        g-ir-compiler is using a C compiler internally, so it needs to set
+        the proper flags for it.
+
+        * PlatformGTK.cmake:
+
 2022-02-22  Youenn Fablet  <[email protected]>
 
         http/wpt/mediarecorder/mute-tracks.html fails with WebRTCRemoteVideoFrameEnabled=true

Modified: trunk/Source/WebKit/PlatformGTK.cmake (290311 => 290312)


--- trunk/Source/WebKit/PlatformGTK.cmake	2022-02-22 17:11:49 UTC (rev 290311)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2022-02-22 17:42:04 UTC (rev 290312)
@@ -675,7 +675,7 @@
     add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
         DEPENDS WebKit
         DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
+        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
             ${INTROSPECTION_SCANNER}
             --quiet
@@ -721,7 +721,7 @@
         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
         DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
         DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}"
             LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
             ${INTROSPECTION_SCANNER}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to