From 8d9fbaaba60d1e044de0856201cc6989b380e2b0 Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 23 Dec 2015 13:46:32 +0200 Subject: Fixed that ccache can be used again (broken by TokuDB patches) For now, only if ccache is installed with symlinks in /usr/lib64/ccache --- BUILD/SETUP.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'BUILD/SETUP.sh') diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 065422459b1..f443c5da680 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -256,6 +256,10 @@ fi # (http://samba.org/ccache) is installed, use it. # We use 'grep' and hope 'grep' will work as expected # (returns 0 if finds lines) + +# As cmake doesn't like CC and CXX with a space, use symlinks from +# /usr/lib64/ccache if they exits. + if test "$USING_GCOV" != "1" then # Not using gcov; Safe to use ccache @@ -264,8 +268,14 @@ fi if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1" then - echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC" - echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX" + if test -x /usr/lib64/ccache/gcc + then + CC=/usr/lib64/ccache/gcc + fi + if test -x /usr/lib64/ccache/g++ + then + CXX=/usr/lib64/ccache/g++ + fi fi # gcov -- cgit v1.2.1