From a656a2f6caa57dc9c445e6d02bc77db93f9b9e9f Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 13 Apr 2017 11:37:47 +1200 Subject: [PATCH] Note that ccache 3.0 works with coverage options However it supports these by disabling caching, so we might as well continue to disable ccache in that situation ourselves until there's a ccache version which actually caches these cases. (cherry picked from commit 5a447cc8348800c4b0288e1115e9fadcd952e66d) --- xapian-core/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xapian-core/Makefile.am b/xapian-core/Makefile.am index d00d73524..0dbb41221 100644 --- a/xapian-core/Makefile.am +++ b/xapian-core/Makefile.am @@ -44,7 +44,11 @@ check-@PERCENT@: cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ ## --disable-shared as shared builds fail for me on x86-64 Debian etch. -## CCACHE_DISABLE as ccache 2.4 doesn't handle the .gcno files. +## CCACHE_DISABLE as ccache 2.4 doesn't handle the .gcno files. This looks +## like it was fixed in ccache 3.0, but only by not caching, so disabling +## explicitly here is harmless. If ccache starts to support --coverage +## (3.3.3 doesn't) then we could reasonably just require ccache >= 3.0 is +## used, as 3.0 was released on 2010-06-20. COVERAGE_CONFIGURE = \ $(srcdir)/configure CXXFLAGS='-O0 --coverage' \ --enable-quiet --disable-shared CCACHE_DISABLE=1 VALGRIND= -- 2.11.4.GIT