diff options
author | Peter Foley <pefoley2@verizon.net> | 2012-09-15 16:41:10 -0400 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:22 +0200 |
commit | 7d2bbd22e7f81475c9b9eb3a4f120267c33818ee (patch) | |
tree | d87a55f6a9ca6ec1cf56cf577c12237d3eb10e24 /configure.in | |
parent | fix for openssl with MSVC when ccache is enabled (diff) | |
download | core-7d2bbd22e7f81475c9b9eb3a4f120267c33818ee.tar.gz core-7d2bbd22e7f81475c9b9eb3a4f120267c33818ee.zip |
prevent ccache from being doubled with MSVC
Change-Id: Idb2fd2a115c5e32d3e894d70c0e86730b38e73e9
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 1c71c13ba612..eebe6da88fba 100644 --- a/configure.in +++ b/configure.in @@ -2455,7 +2455,7 @@ AC_SUBST(SYSBASE) dnl =================================================================== dnl Checks if ccache is available dnl =================================================================== -if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" -a "$build_os" != "cygwin" \); then +if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \); then case "%$CC%$CXX%" in # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some verison number etc), # assume that's good then @@ -4850,22 +4850,24 @@ fi # # prefx CXX with ccache if needed # -if test "$CCACHE" != ""; then - AC_MSG_CHECKING([whether $CXX is already ccached]) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS --ccache-skip -O2" - dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) - if test $use_ccache = yes; then - AC_MSG_RESULT([yes]) - else - CXX="$CCACHE $CXX" - AC_MSG_RESULT([no]) - fi - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) +if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then + if test "$CCACHE" != ""; then + AC_MSG_CHECKING([whether $CXX is already ccached]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes; then + AC_MSG_RESULT([yes]) + else + CXX="$CCACHE $CXX" + AC_MSG_RESULT([no]) + fi + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi fi dnl =================================================================== |