configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
New commits: commit 9ffa51c3cb27cf3ec58c24c8e5b41cd2bf09fd5b Author: Norbert Thiebaud <[email protected]> Date: Thu Mar 17 12:20:27 2016 -0500 clang and ccache do not play nice if CCACHE_CCP2=YES is not set that cause surious warning that are turned into error with -Werror indicate that this will cause errors (not only warning) and disable ccache if it was an implicit enable-ccache. error out if it was an explicit --enable-ccache Change-Id: I351af8b8d73175cd2ce9e52ee3c376ba6a387af1 Reviewed-on: https://gerrit.libreoffice.org/23338 Tested-by: Jenkins <[email protected]> Reviewed-by: Norbert Thiebaud <[email protected]> diff --git a/configure.ac b/configure.ac index 23b6fb0..c2bb656 100644 --- a/configure.ac +++ b/configure.ac @@ -3793,8 +3793,13 @@ AC_SUBST(COM_IS_CLANG) if test "$CCACHE" != "" -a "$COM_IS_CLANG" = TRUE; then if test -z "$CCACHE_CPP2"; then - AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings.]) - add_warning "Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings." + if test "$enable_ccache" = "" ; then + AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings/errors.]) + add_warning "Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings/errors. Disabling it." + CCACHE= + else + AC_MSG_ERROR([Using --enable-ccache with Clang without CCACHE_CPP2 set causes spurious warnings/errors.]) + fi fi fi _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
