blob: 9e2bf09dd7d6dff6cbbd4d058a2f0460040b7cc2 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Oct 2015 14:18:57 +0200
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
5 compiler flags.
Brad Bishop6e60e8b2018-02-01 10:27:11 -05006
7g-ir-compiler is using a C compiler internally, so it needs to set
8the proper flags for it.
9
Andrew Geissler595f6302022-01-24 19:11:47 +000010Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232936]
Brad Bishop6e60e8b2018-02-01 10:27:11 -050011Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
Brad Bishop19323692019-04-05 15:28:33 -040014 Source/JavaScriptCore/PlatformGTK.cmake | 2 +-
15 Source/WebKit/PlatformGTK.cmake | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017
Brad Bishop19323692019-04-05 15:28:33 -040018diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
19index 0b2968d2..2742ad80 100644
20--- a/Source/JavaScriptCore/PlatformGTK.cmake
21+++ b/Source/JavaScriptCore/PlatformGTK.cmake
22@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
23 add_custom_command(
24 OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
25 DEPENDS JavaScriptCore
26- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
27+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
28 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
29 ${INTROSPECTION_SCANNER}
30 --quiet
Brad Bishop6e60e8b2018-02-01 10:27:11 -050031diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
Brad Bishop19323692019-04-05 15:28:33 -040032index e36e4c35..943f9794 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033--- a/Source/WebKit/PlatformGTK.cmake
34+++ b/Source/WebKit/PlatformGTK.cmake
Brad Bishop19323692019-04-05 15:28:33 -040035@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
37 DEPENDS WebKit
38 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
39- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
40+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
41 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
42 ${INTROSPECTION_SCANNER}
43 --quiet
Brad Bishop19323692019-04-05 15:28:33 -040044@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080045 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
46 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
47 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
48- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
49+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
50 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
51 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
52 ${INTROSPECTION_SCANNER}