diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-29 01:47:35 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-29 01:47:35 +0200 |
| commit | 410fc81a726d586e67b45beb0406e1e681494ce4 (patch) | |
| tree | 9a81ea8e9e695584f7915cc104eda630d7b98bc8 /BUILD | |
| parent | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (diff) | |
| download | mariadb-git-410fc81a726d586e67b45beb0406e1e681494ce4.tar.gz | |
After merge fixes
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 6 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-gcov | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index d2534d42b33..9ce2570746b 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -187,6 +187,12 @@ fi # (http://samba.org/ccache) is installed, use it. # We use 'grep' and hope 'grep' will work as expected # (returns 0 if finds lines) +if test "$USING_GCOV" != "1" +then + # Not using gcov; Safe to use ccache + CCACHE_GCOV_VERSION_ENABLED=1 +fi + if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1" then echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC" diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index 1a49b5f836a..5ee3c071f61 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -2,6 +2,7 @@ # Need to disable ccache, or we loose the gcov-needed compiler output files. +USING_GCOV=1 CCACHE_GCOV_VERSION_ENABLED=0 if ccache -V > /dev/null 2>&1 then |