From 1f3db7840a2551a55c198f8b42ee6947f48b021e Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Mon, 30 Mar 2015 23:28:55 +0200
Subject: Makefile.introspection: pass CC to scanner

Extends commit 92d9c38 to also pass CC to g-ir-scanner.

https://bugzilla.gnome.org/show_bug.cgi?id=700066
---
 Makefile.introspection       | 2 +-
 tests/repository/Makefile.am | 9 +++++----
 tests/scanner/Makefile.am    | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.introspection b/Makefile.introspection
index 973d9d33..cd7bd1b1 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -84,7 +84,7 @@ _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
 
-_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"
 
 #
 # Creates a GIR by scanning C headers/sources
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 882fa9ec..c79ba81f 100644
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -19,7 +19,8 @@ gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
 TESTS = gitestrepo gitestthrows gitypelibtest
 TESTS_ENVIRONMENT=env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \
-   XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \
-   PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \
-   LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \
-   $(DEBUG)
+	XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \
+	PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \
+	CC="$(CC)" \
+	LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \
+	$(DEBUG)
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index c7a1b32c..2b3188ef 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -221,6 +221,7 @@ PYTESTS = \
 
 TESTS = $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
+	CC="$(CC)" \
 	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
 LOG_COMPILER = $(top_srcdir)/tests/gi-tester
 
-- 
cgit v1.2.1