diff options
Diffstat (limited to 'BUILD/FINISH.sh')
| -rw-r--r-- | BUILD/FINISH.sh | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index decfe5021b4..16ee8ffdc5e 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -1,21 +1,36 @@ cflags="$c_warnings $extra_flags" cxxflags="$cxx_warnings $base_cxxflags $extra_flags" configure="./configure $base_configs $extra_configs" -for arg in "$@"; do - configure="$configure "`echo "$arg" | sed -e 's,\([^a-zA-Z0-9_.-]\),\\\\\1,g'` +for arg +do + # Escape special characters so they don't confuse eval + configure="$configure "`echo "$arg" | \ + sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'` done +commands="\ +$make -k clean || true +/bin/rm -f */.deps/*.P config.cache -eval "CFLAGS='$cflags' CXX=gcc CXXFLAGS='$cxxflags' $configure" +aclocal; autoheader; aclocal; automake; autoconf -if [ "x$do_make" = "xno" ] ; then - exit 0 -fi +CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure + +$make $AM_MAKEFLAGS" + +if [ "x$strip" = "xyes" ] +then + commands="$commands -$make $AM_MAKEFLAGS -if [ "x$strip" = "xyes" ]; then - mkdir -p tmp - nm --numeric-sort sql/mysqld > tmp/mysqld.sym - objdump -d sql/mysqld > tmp/mysqld.S - strip sql/mysqld +mkdir tmp +nm --numeric-sort sql/mysqld > tmp/mysqld.sym +objdump -d sql/mysqld > tmp/mysqld.S +strip sql/mysqld" fi + +if test -z "$nonono" +then + eval "set -x; $commands" +else + echo "$commands" +fi |