diff options
| author | Monty <monty@mariadb.org> | 2018-01-21 20:32:48 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-21 20:32:48 +0200 |
| commit | 27a5d96bcb6c4a13284934e3bc409f9c5142885c (patch) | |
| tree | 76806150200cfef9838f2c70e5c1e577f5a0a349 /BUILD | |
| parent | c6cd64f3cb4202fdadeb470fe28f6c50e337f460 (diff) | |
| parent | 6b7dcefdc83c4444ac8a4623b46810ff940528db (diff) | |
| download | mariadb-git-27a5d96bcb6c4a13284934e3bc409f9c5142885c.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/sp_rcontext.cc
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 1 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-gprof | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-gcov | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-gprof | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 2d6548dda0e..3a1a861f2f8 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -307,3 +307,4 @@ gprof_compile_flags="-O2 -pg -g" gprof_link_flags="--disable-shared $static_link" +disable_gprof_plugins="--with-zlib-dir=bundled --without-plugin-oqgraph --without-plugin-mroonga" diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium-gprof index de014e3ae8b..498c964df74 100755 --- a/BUILD/compile-pentium-gprof +++ b/BUILD/compile-pentium-gprof @@ -19,6 +19,6 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium_cflags $gprof_compile_flags" -extra_configs="$pentium_configs $debug_configs $gprof_link_flags $disable_64_bit_plugins" +extra_configs="$pentium_configs $debug_configs $gprof_link_flags $disable_64_bit_plugins $disable_gprof_plugins" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium64-gcov b/BUILD/compile-pentium64-gcov index 9587c51b4e0..6e3366c79bd 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" +extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs --without-oqgraph" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium64-gprof b/BUILD/compile-pentium64-gprof index b7821e06b6e..346777a4611 100755 --- a/BUILD/compile-pentium64-gprof +++ b/BUILD/compile-pentium64-gprof @@ -20,6 +20,6 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium64_cflags $gprof_compile_flags" -extra_configs="$pentium_configs $max_configs $gprof_link_flags --with-zlib-dir=bundled" +extra_configs="$pentium_configs $max_configs $gprof_link_flags $disable_gprof_plugins" . "$path/FINISH.sh" |