mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Other things:
- Do not use ccache when building with gcov
This commit is contained in:
Monty 2021-06-14 19:51:37 +03:00
parent c2c10094a8
commit 7f0024a54f
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BUILD/FINISH.sh
View file

@ -40,16 +40,22 @@ then
git clean -fdX git clean -fdX
cd ./libmariadb cd ./libmariadb
git submodule update git submodule update
git clean -fdX
cd ../storage/rocksdb/rocksdb cd ../storage/rocksdb/rocksdb
git clean -fdX
git submodule update git submodule update
git clean -fdX
cd ../../maria/libmarias3 cd ../../maria/libmarias3
git submodule update git submodule update
git clean -fdX
cd ../../.. cd ../../..
cd storage/columnstore/columnstore cd storage/columnstore/columnstore
git submodule update git submodule update
git clean -fdX
cd ../../.. cd ../../..
cd wsrep-lib cd wsrep-lib
git submodule update git submodule update
git clean -fdX
cd .." cd .."
fi fi
commands="$commands commands="$commands

8
BUILD/SETUP.sh
View file

@ -274,13 +274,7 @@ fi
# As cmake doesn't like CC and CXX with a space, use symlinks from # As cmake doesn't like CC and CXX with a space, use symlinks from
# /usr/lib64/ccache if they exits. # /usr/lib64/ccache if they exits.
if test "$USING_GCOV" != "1" if ccache -V > /dev/null 2>&1 && test "$CCACHE_DISABLE" != "1" && test "$CC" = "gcc"
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"
then then
if test -x /usr/lib64/ccache/gcc if test -x /usr/lib64/ccache/gcc
then then

3
BUILD/compile-amd64-gcov
View file

@ -16,12 +16,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh"
# Need to disable ccache, or we loose the gcov-needed compiler output files. # Need to disable ccache, or we loose the gcov-needed compiler output files.
CCACHE_DISABLE=1 CCACHE_DISABLE=1
export CCACHE_DISABLE export CCACHE_DISABLE
. "$path/SETUP.sh"
export LDFLAGS="$gcov_link_flags" export LDFLAGS="$gcov_link_flags"
extra_flags="$amd64_cflags $debug_cflags $max_cflags $gcov_compile_flags" extra_flags="$amd64_cflags $debug_cflags $max_cflags $gcov_compile_flags"

4
BUILD/compile-pentium64-gcov
View file

@ -16,13 +16,15 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
set -x -v
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh"
# Need to disable ccache, or we loose the gcov-needed compiler output files. # Need to disable ccache, or we loose the gcov-needed compiler output files.
CCACHE_DISABLE=1 CCACHE_DISABLE=1
export CCACHE_DISABLE export CCACHE_DISABLE
. "$path/SETUP.sh"
export LDFLAGS="$gcov_link_flags" export LDFLAGS="$gcov_link_flags"
extra_flags="$pentium64_cflags $max_cflags $gcov_compile_flags" extra_flags="$pentium64_cflags $max_cflags $gcov_compile_flags"