mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
961821d7ae
Fix bad merge causing error when specifying test case in non-default suite for mysql-test-run. Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. Improve unclear help text in mysql-test-run BUILD/FINISH.sh: Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. BUILD/SETUP.sh: Implement the ability to add extra flags and configure options when running BUILD/xxx scripts. extra/yassl/taocrypt/include/block.hpp: Fix some compiler warnings. mysql-test/lib/mtr_cases.pm: Fix bad merge causing error when specifying test case in non-default suite for mysql-test-run. Also remove some non-essential differences to mysql version to simplify future merges. mysql-test/mysql-test-run.pl: Improve help texts. plugin/fulltext/plugin_example.c: Fix some compiler warnings. vio/viosslfactories.c: Fix some compiler warnings.
42 lines
1,013 B
Bash
42 lines
1,013 B
Bash
cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS"
|
|
cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS"
|
|
extra_configs="$extra_configs $local_infile_configs $EXTRA_CONFIGS"
|
|
configure="./configure $base_configs $extra_configs"
|
|
|
|
commands="\
|
|
$make -k maintainer-clean || true
|
|
/bin/rm -rf */.deps/*.P configure config.cache storage/*/configure storage/*/config.cache autom4te.cache storage/*/autom4te.cache;
|
|
|
|
path=`dirname $0`
|
|
. \"$path/autorun.sh\""
|
|
|
|
if [ -z "$just_clean" ]
|
|
then
|
|
commands="$commands
|
|
CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
|
|
$configure"
|
|
fi
|
|
|
|
if [ -z "$just_configure" -a -z "$just_clean" ]
|
|
then
|
|
commands="$commands
|
|
|
|
$make $AM_MAKEFLAGS"
|
|
|
|
if [ "x$strip" = "xyes" ]
|
|
then
|
|
commands="$commands
|
|
|
|
mkdir -p tmp
|
|
nm --numeric-sort sql/mysqld > tmp/mysqld.sym
|
|
objdump -d sql/mysqld > tmp/mysqld.S
|
|
strip sql/mysqld"
|
|
fi
|
|
fi
|
|
|
|
if test -z "$just_print"
|
|
then
|
|
eval "set -x; $commands"
|
|
else
|
|
echo "$commands"
|
|
fi
|