diff options
author | Monty <monty@mariadb.org> | 2015-12-23 13:46:32 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2015-12-23 13:46:32 +0200 |
commit | 8d9fbaaba60d1e044de0856201cc6989b380e2b0 (patch) | |
tree | 5425a45df6b851e6bcd0f6ac4310fa74ef192ab9 /BUILD | |
parent | deef90eb753bfe132be2e3b46536a29dde93de8a (diff) | |
download | mariadb-git-8d9fbaaba60d1e044de0856201cc6989b380e2b0.tar.gz |
Fixed that ccache can be used again (broken by TokuDB patches)
For now, only if ccache is installed with symlinks in /usr/lib64/ccache
Diffstat (limited to 'BUILD')
-rwxr-xr-x | BUILD/SETUP.sh | 14 |
1 files changed, 12 insertions, 2 deletions
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 |