Commit 7f0024a5 authored by Monty's avatar Monty

Fixed BUILD scripts to remove all .gcov and .gcno files from submodules

Other things:
- Do not use ccache when building with gcov
parent c2c10094
......@@ -40,16 +40,22 @@ then
git clean -fdX
cd ./libmariadb
git submodule update
git clean -fdX
cd ../storage/rocksdb/rocksdb
git clean -fdX
git submodule update
git clean -fdX
cd ../../maria/libmarias3
git submodule update
git clean -fdX
cd ../../..
cd storage/columnstore/columnstore
git submodule update
git clean -fdX
cd ../../..
cd wsrep-lib
git submodule update
git clean -fdX
cd .."
fi
commands="$commands
......
......@@ -274,13 +274,7 @@ fi
# 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
CCACHE_GCOV_VERSION_ENABLED=1
fi
if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1" && test "$CC" = "gcc"
if ccache -V > /dev/null 2>&1 && test "$CCACHE_DISABLE" != "1" && test "$CC" = "gcc"
then
if test -x /usr/lib64/ccache/gcc
then
......
......@@ -16,12 +16,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
path=`dirname $0`
. "$path/SETUP.sh"
# Need to disable ccache, or we loose the gcov-needed compiler output files.
CCACHE_DISABLE=1
export CCACHE_DISABLE
. "$path/SETUP.sh"
export LDFLAGS="$gcov_link_flags"
extra_flags="$amd64_cflags $debug_cflags $max_cflags $gcov_compile_flags"
......
......@@ -16,13 +16,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
set -x -v
path=`dirname $0`
. "$path/SETUP.sh"
# Need to disable ccache, or we loose the gcov-needed compiler output files.
CCACHE_DISABLE=1
export CCACHE_DISABLE
. "$path/SETUP.sh"
export LDFLAGS="$gcov_link_flags"
extra_flags="$pentium64_cflags $max_cflags $gcov_compile_flags"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment