| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From bae9f73b2c693b5aa156fed717d6481b60682786 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] When building introspection files, add CMAKE_C_FLAGS to the |
| 5 | 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 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake |
| 17 | index 706f1e8..14a1c3b 100644 |
| 18 | --- a/Source/WebKit2/PlatformGTK.cmake |
| 19 | +++ b/Source/WebKit2/PlatformGTK.cmake |
| 20 | @@ -884,7 +884,7 @@ add_custom_command( |
| 21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
| 22 | DEPENDS WebKit2 |
| 23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
| 24 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= |
| 25 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
| 26 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
| 27 | ${INTROSPECTION_SCANNER} |
| 28 | --quiet |
| 29 | @@ -930,7 +930,7 @@ add_custom_command( |
| 30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
| 31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
| 32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
| 33 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations |
| 34 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
| 35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
| 36 | LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
| 37 | ${INTROSPECTION_SCANNER} |
| 38 | -- |
| 39 | 2.6.4 |
| 40 | |