Commit 1134fa6b authored by unknown's avatar unknown

- added two small fixes to Do-compile script


Build-tools/Do-compile:
   - actually add the with-other-libc option to the config options when set
   - fixed some odd-placed quotation marks in the configure line
parent af34e398
...@@ -159,7 +159,8 @@ if ($opt_stage <= 1) ...@@ -159,7 +159,8 @@ if ($opt_stage <= 1)
} }
if ($opt_with_other_libc) if ($opt_with_other_libc)
{ {
$opt_with_other_libc = "--with-other-libc=$opt_with_other_libc"; $opt_with_other_libc= "--with-other-libc=$opt_with_other_libc";
$opt_config_options.= " $opt_with_other_libc";
} }
if (!$opt_enable_shared) if (!$opt_enable_shared)
{ {
...@@ -181,7 +182,7 @@ if ($opt_stage <= 1) ...@@ -181,7 +182,7 @@ if ($opt_stage <= 1)
{ {
$opt_config_options.= " --with-libwrap" $opt_config_options.= " --with-libwrap"
} }
check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL"); check_system("$opt_config_env ./configure --prefix=/usr/local/mysql --with-comment=\"Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");
if (-d "$pwd/$host/include-mysql") if (-d "$pwd/$host/include-mysql")
{ {
safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment