Skip to content

Commit

Permalink
- Fix the ccache detection
Browse files Browse the repository at this point in the history
  • Loading branch information
foobar committed Nov 30, 2005
1 parent 6fddd6f commit 13c1c6c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
6 changes: 0 additions & 6 deletions Makefile.gcov
Expand Up @@ -5,12 +5,6 @@

lcov: lcov-html

lcov-ccache:
@if test -z "$(CCACHE_DISABLE)" || test "$(CCACHE_DISABLE)" != "1"; then \
echo "ccache is not disabled. Set environment variable CCACHE_DISABLE=1 to disable ccache."; \
exit 123; \
fi

lcov-test: all
@echo "Running test suite"
@find . -name \*.gcda | xargs rm -f
Expand Down
15 changes: 7 additions & 8 deletions configure.in
Expand Up @@ -608,14 +608,13 @@ if test "$PHP_GCOV" = "yes"; then
fi

dnl Check if ccache is being used
dnl FIXME: Need a check for ccache usage, the one below does not work!
PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])

if test "$gcc_ccache" = "yes"; then
if test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"; then
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
fi
lcov_target="lcov-ccache"
case `$php_shtool path $CC` in
*ccache*[)] gcc_ccache=yes;;
*[)] gcc_ccache=no;;
esac

if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
fi

ltp_version_list="1.4"
Expand Down

0 comments on commit 13c1c6c

Please sign in to comment.