Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 |
| 4 | Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to |
| 5 | the compiler flags. |
| 6 | |
| 7 | g-ir-compiler is using a C compiler internally, so it needs to set |
| 8 | the proper flags for it. |
| 9 | |
| 10 | Upstream-Status: Pending [review on oe-core list] |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | |
| 13 | --- |
| 14 | Source/WebKit/PlatformGTK.cmake | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
| 18 | index 7f92ae72..a33c6a86 100644 |
| 19 | --- a/Source/WebKit/PlatformGTK.cmake |
| 20 | +++ b/Source/WebKit/PlatformGTK.cmake |
| 21 | @@ -1126,7 +1126,7 @@ add_custom_command( |
| 22 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
| 23 | DEPENDS WebKit2 |
| 24 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
| 25 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= |
| 26 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
| 27 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
| 28 | ${INTROSPECTION_SCANNER} |
| 29 | --quiet |
| 30 | @@ -1169,7 +1169,7 @@ add_custom_command( |
| 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
| 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
| 33 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
| 34 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations |
| 35 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
| 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
| 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
| 38 | ${INTROSPECTION_SCANNER} |
| 39 | -- |
| 40 | 2.14.1 |
| 41 | |