diff options
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 4 | ||||
| -rwxr-xr-x | BUILD/SETUP.sh | 13 | ||||
| -rw-r--r-- | BUILD/cmake_configure.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-gcov | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 86085fcc593..b41c5c5139d 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -32,9 +32,9 @@ then configure="$configure --verbose" fi +# git clean -fdX removes all ignored (build) files commands="\ -/bin/rm -rf configure; -/bin/rm -rf CMakeCache.txt CMakeFiles/ +git clean -fdX path=`dirname $0` . \"$path/autorun.sh\"" diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 36072ebaa7e..22357ce7fc8 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -42,7 +42,7 @@ Usage: $0 [-h|-n] [configure-options] Influences the debug flags. Old is default. --prefix=path Build with prefix 'path'. -Note: this script is intended for internal use by MySQL developers. +Note: this script is intended for internal use by MariaDB developers. EOF } @@ -120,10 +120,9 @@ path=`dirname $0` get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL -# implementation of SSL. To use OpenSSL you will need to specify -# the location of OpenSSL headers and libs on your system. -# Ex --with-ssl=/usr -SSL_LIBRARY=--with-ssl +# implementation of SSL. --with-ssl=yes will first try system library +# then the boundled one --with-ssl=system will use the system library. +SSL_LIBRARY=--with-ssl=system if [ "x$warning_mode" = "xpedantic" ]; then warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" @@ -170,7 +169,7 @@ debug_cflags="-DEXTRA_DEBUG -DSAFE_MUTEX -DSAFEMALLOC" error_inject="--with-error-inject " # # Base C++ flags for all builds -base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" +base_cxxflags="-felide-constructors -fexceptions -fno-rtti" # # Flags for optimizing builds. # Be as fast as we can be without losing our ability to backtrace. @@ -293,7 +292,7 @@ gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov" # 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. -gcov_link_flags="-fprofile-arcs -ftest-coverage" +gcov_link_flags="-fprofile-arcs -ftest-coverage -lgcov" gcov_configs="--with-gcov" diff --git a/BUILD/cmake_configure.sh b/BUILD/cmake_configure.sh index 668d6a81b5c..5d7c317f86f 100644 --- a/BUILD/cmake_configure.sh +++ b/BUILD/cmake_configure.sh @@ -18,7 +18,7 @@ # MA 02110-1301, USA # Ensure cmake and perl are there -cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no +cmake --help >/dev/null 2>&1 || HAVE_CMAKE=no perl --version >/dev/null 2>&1 || HAVE_PERL=no scriptdir=`dirname $0` if test "$HAVE_CMAKE" = "no" diff --git a/BUILD/compile-pentium64-gcov b/BUILD/compile-pentium64-gcov index 36d4b6192ec..9587c51b4e0 100755 --- a/BUILD/compile-pentium64-gcov +++ b/BUILD/compile-pentium64-gcov @@ -28,6 +28,6 @@ export LDFLAGS="$gcov_link_flags" extra_flags="$pentium64_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 --with-zlib-dir=bundled" +extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs" . "$path/FINISH.sh" |