summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-01-03 12:48:55 +0200
committerMonty <monty@mariadb.org>2016-01-03 12:48:55 +0200
commit4b4777ab63522b2bdd1f98ad03558a5b1da53dc0 (patch)
tree6ec90186e428027324179e3d9d39681649d95140 /BUILD
parentae7b39a13a312d9787a4895874f641e2dfe3adca (diff)
downloadmariadb-git-4b4777ab63522b2bdd1f98ad03558a5b1da53dc0.tar.gz
Backported fix for ccache
Fixed compiler warnings Added --big-test to tokudb change_column_char & change_column_bin
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/SETUP.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index bde095b0aa8..858f42320b8 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -31,6 +31,7 @@ Usage: $0 [-h|-n] [configure-options]
-h, --help Show this help message.
-n, --just-print Don't actually run any commands; just print them.
-c, --just-configure Stop after running configure.
+ Combined with --just-print shows configure options.
--extra-configs=xxx Add this to configure options
--extra-flags=xxx Add this C and CXX flags
--extra-cflags=xxx Add this to C flags
@@ -257,6 +258,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
@@ -265,8 +270,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