diff options
| author | Luboš Luňák <l.lunak@centrum.cz> | 2021-11-25 11:16:15 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-11-25 13:12:19 +0100 |
| commit | b041897b767ea4d6c64f4d22036d23f61d6907f5 (patch) | |
| tree | 3121884cd9a0727106c926bcfd1300941890c5be | |
| parent | fabed8f7b9a5e57cbb62e6570349c33f000c2291 (diff) | |
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.lunak@collabora.com>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
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 |