configure.ac | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit b041897b767ea4d6c64f4d22036d23f61d6907f5
Author: Luboš Luňák <l.lu...@centrum.cz>
AuthorDate: Thu Nov 25 11:16:15 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Nov 25 13:12:19 2021 +0100
fix windows ccache support
I accidentally pushed an older version of the commit.
PCHs work fine with ccache, so no need to disable one or another.
And $COM is not set yet at the time when ccache is detected, so
use $os instead.
Change-Id: I1802684d6bbdee940b7062be0b8010a887216834
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125800
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 593170c4572a..9a5df92f922f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3068,8 +3068,6 @@ elif test -n "$enable_ccache" -o \( "$enable_ccache" = ""
-a "$enable_icecream"
AC_PATH_PROG([CCACHE],[ccache],[not found])
if test "$CCACHE" != "not found" -a "$_os" = "WINNT"; then
CCACHE=`win_short_path_for_make "$CCACHE"`
- fi
- if test "$CCACHE" != "not found" -a "$COM" = MSC; then
# check that it has MSVC support (it should recognize it in
CCACHE_COMPILERTYPE)
rm -f conftest.txt
AC_MSG_CHECKING([whether $CCACHE has MSVC support])
@@ -5928,8 +5926,8 @@ if test -z "$enable_pch"; then
if test "$_os" = "WINNT"; then
# Enabled by default on Windows.
enable_pch=yes
- # never use [s]ccache on auto-enabled PCH builds, except if requested
explicitly
- if test -z "$enable_ccache"; then
+ # never use sccache on auto-enabled PCH builds, except if requested
explicitely
+ if test -z "$enable_ccache" -a "$SCCACHE"; then
CCACHE=""
fi
else
