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 <alex@linutronix.de> 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: Canonical link: https://commits.webkit.org/247635@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290312 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 22, 2022 · 46311b0acd2aeed6db2f0e03ddf530d5dfa6b6ff · 46311b0
1 parent aad5dd5
commit 46311b0acd2aeed6db2f0e03ddf530d5dfa6b6ff
Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2022-02-22  Alexander Kanavin  <alex@linutronix.de>
+
+        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  <asumu@igalia.com>
 
         Initial support for Wasm/ESM-integration in the WebCore module loader

diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
         DEPENDS JavaScriptCore
-        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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2022-02-22  Alexander Kanavin  <alex@linutronix.de>
+
+        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  <youenn@apple.com>
 
         http/wpt/mediarecorder/mute-tracks.html fails with WebRTCRemoteVideoFrameEnabled=true

diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
@@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION)
     add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
         DEPENDS WebKit
         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${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 @@ if (ENABLE_INTROSPECTION)
         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${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}