From 7b639e21fc285fdf46bd5f890f7911619d71d232 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 26 Oct 2012 14:55:54 -0400 Subject: common: Ensure we use $(CC) from environment when compiling scanned binaries GNU make will default to "gcc" if "cc" isn't found; we need to replicate that behavior here. Patch-suggested-by: ojab https://bugzilla.gnome.org/show_bug.cgi?id=678678 --- common.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 052d5b4b..f67b2e83 100644 --- a/common.mk +++ b/common.mk @@ -9,6 +9,7 @@ INTROSPECTION_SCANNER = \ env PATH=.libs:$(PATH) \ LPATH=.libs \ + CC=$(CC) \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -- cgit v1.2.1 From 54aaf14da2e02f1c8e60c1c5229c9b7d5932482d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 12 Dec 2012 09:15:22 +1000 Subject: common.mk: escape $CC in quotes If CC is defined at "ccache gcc", the expanded command ends up as: env PATH=... CC=ccache gcc PYTHONPATH=... ./g-ir-scanner causing compilation errors. https://bugzilla.gnome.org/show_bug.cgi?id=690074 --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index f67b2e83..87ceaee2 100644 --- a/common.mk +++ b/common.mk @@ -9,7 +9,7 @@ INTROSPECTION_SCANNER = \ env PATH=.libs:$(PATH) \ LPATH=.libs \ - CC=$(CC) \ + CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -- cgit v1.2.1 From 86f7acf0f139a917e460db26872b5a4306fca8d2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 06:58:53 -0500 Subject: tests: Use Regress GIR for doctool This makes us test a lot more functionality in the doc tool, and removes the need to have a lot of different test libraries, and different test infrastructure. --- common.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 87ceaee2..28b73c7e 100644 --- a/common.mk +++ b/common.mk @@ -40,3 +40,9 @@ INTROSPECTION_DOCTOOL = \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ $(top_builddir)/g-ir-doc-tool + +INTROSPECTION_DOCTOOL_ARGS = \ + --add-include-path=$(srcdir) \ + --add-include-path=$(top_srcdir)/gir \ + --add-include-path=$(builddir) \ + --add-include-path=$(top_builddir) -- cgit v1.2.1