| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From c06d8a8990c996cbb854508a944202ba70ba7a7c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 3 Mar 2022 20:10:04 -0800 |
| 4 | Subject: [PATCH] cmake: Do not export CC into gir compiler |
| 5 | |
| 6 | this helps cross compilers where full compiler commandline defines the |
| 7 | compiler rather than just CC variable, therefore let it use the default |
| 8 | values from environment and not synthesize it from CMAKE_C_COMPILER just |
| 9 | for this case. |
| 10 | |
| 11 | Upstream-Status: Submitted [https://github.com/libical/libical/pull/552] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | cmake/modules/GObjectIntrospectionMacros.cmake | 3 +-- |
| 15 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake |
| 18 | index 83aff931..d7d3f898 100644 |
| 19 | --- a/cmake/modules/GObjectIntrospectionMacros.cmake |
| 20 | +++ b/cmake/modules/GObjectIntrospectionMacros.cmake |
| 21 | @@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) |
| 22 | set(_gir_libtool "--no-libtool") |
| 23 | |
| 24 | add_custom_command( |
| 25 | - COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" |
| 26 | - ${GObjectIntrospection_SCANNER} |
| 27 | + COMMAND ${GObjectIntrospection_SCANNER} |
| 28 | ${GObjectIntrospection_SCANNER_ARGS} |
| 29 | --namespace=${_gir_namespace} |
| 30 | --nsversion=${_gir_version} |
| 31 | -- |
| 32 | 2.35.1 |
| 33 | |