summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-06-12 11:04:31 +0200
committerunknown <monty@work.mysql.com>2001-06-12 11:04:31 +0200
commitbe2b125bf8d54c3d3d1051b7dbb4ed62de351788 (patch)
tree5ca4dccf2941fedb21593b0edb5c917e3fefd63c /Build-tools
parent54fe14e2f6d4249b4317dd8e9d4473fb665a468c (diff)
downloadmariadb-git-be2b125bf8d54c3d3d1051b7dbb4ed62de351788.tar.gz
Added --enable-shared to Do-compile
Build-tools/Do-compile: Added --enable-shared BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Do-compile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 3ef9ba614f9..958cb1c8edb 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -4,10 +4,10 @@ use Getopt::Long;
$opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env="";
$opt_dbd_options=$opt_perl_options=$opt_suffix="";
$opt_tmp=$version_suffix="";
-$opt_help=$opt_Information=$opt_no_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=0;
+$opt_help=$opt_Information=$opt_no_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=0;
$opt_innodb=$opt_bdb=0;
-GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution") || usage();
+GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me") || usage();
usage() if ($opt_help || $opt_Information);
usage() if (!$opt_distribution);
@@ -119,7 +119,10 @@ if ($opt_stage <= 1)
{
$opt_config_options.=" --with-client-ldflags=-all-static";
}
- $opt_config_options.= " --disable-shared"; # Default for binary versions
+ if (!$opt_enable_shared)
+ {
+ $opt_config_options.= " --disable-shared"; # Default for binary versions
+ }
if ($opt_bdb)
{
$opt_config_options.= " --with-berkeley-db"
@@ -237,7 +240,7 @@ if ($opt_stage <= 7 && $opt_perl_files && !$opt_no_perl && !$opt_no_test)
}
-if ($opt_stage <= 8 && !$opt_no_test)
+if ($opt_stage <= 8 && !$opt_no_test && !$opt_no_crash_me)
{
safe_cd("$test_dir/sql-bench");
log_system("rm -f limits/mysql.cfg");