From 7f0024a54f9b107800ddbd21246e375f4660790d Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Mon, 14 Jun 2021 19:51:37 +0300
Subject: Fixed BUILD scripts to remove all .gcov and .gcno files from
 submodules

Other things:
- Do not use ccache when building with gcov
---
 BUILD/FINISH.sh              | 6 ++++++
 BUILD/SETUP.sh               | 8 +-------
 BUILD/compile-amd64-gcov     | 3 ++-
 BUILD/compile-pentium64-gcov | 4 +++-
 4 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'BUILD')

diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 015f973d8a8..14347ca8232 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -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
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 9cd022f8ad8..e77d86d2462 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -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
diff --git a/BUILD/compile-amd64-gcov b/BUILD/compile-amd64-gcov
index c9bd3f36dd2..83c6b64d678 100755
--- a/BUILD/compile-amd64-gcov
+++ b/BUILD/compile-amd64-gcov
@@ -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"
diff --git a/BUILD/compile-pentium64-gcov b/BUILD/compile-pentium64-gcov
index 534ee8a6b3e..f66499cbc36 100755
--- a/BUILD/compile-pentium64-gcov
+++ b/BUILD/compile-pentium64-gcov
@@ -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"
-- 
cgit v1.2.1