summaryrefslogtreecommitdiff
path: root/BUILD/compile-pentium-gcov
diff options
context:
space:
mode:
authormalff/marcsql@weblab.(none) <>2007-08-30 13:23:59 -0600
committermalff/marcsql@weblab.(none) <>2007-08-30 13:23:59 -0600
commit2482c59740ba73b62851f175fbe2b7adf70f76ae (patch)
tree8a9eb637bc86a49e83f7ac315d1483f381fea0a2 /BUILD/compile-pentium-gcov
parent52ae4496c560829fe48a4a1c6145b17199492b4d (diff)
parent7ed3555c673db711db27cf645fd4aaa367402922 (diff)
downloadmariadb-git-2482c59740ba73b62851f175fbe2b7adf70f76ae.tar.gz
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
Diffstat (limited to 'BUILD/compile-pentium-gcov')
-rwxr-xr-xBUILD/compile-pentium-gcov13
1 files changed, 3 insertions, 10 deletions
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 77de5867d48..42666b2632c 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -20,18 +20,11 @@ export CCACHE_GCOV_VERSION_ENABLED
path=`dirname $0`
. "$path/SETUP.sh"
-# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well
-# as on the compiler command line), and this requires setting LDFLAGS for BDB.
-export LDFLAGS="-fprofile-arcs -ftest-coverage"
+export LDFLAGS="$gcov_link_flags"
-# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
-# code with profiling information used by gcov.
-# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
-# The -DHAVE_gcov enables code to write out coverage info even when crashing.
-extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY $debug_extra_flags $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
-extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
-extra_configs="$extra_configs $max_configs"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags $gcov_compile_flags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs"
. "$path/FINISH.sh"