summaryrefslogtreecommitdiff
path: root/Build-tools/Do-linux-build
diff options
context:
space:
mode:
Diffstat (limited to 'Build-tools/Do-linux-build')
-rwxr-xr-xBuild-tools/Do-linux-build10
1 files changed, 9 insertions, 1 deletions
diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build
index e5b0a49fe75..a8b12d8b4ae 100755
--- a/Build-tools/Do-linux-build
+++ b/Build-tools/Do-linux-build
@@ -1,9 +1,17 @@
#! /bin/sh
set -e -x
+
+# Only use the "--with-other-libc" parameter, if another libc actually
+# exists, since this will also force static linking, which does not work
+# together with OpenSSL
OTHER_LIBC_DIR=/usr/local/mysql-glibc
+OTHER_LIBC=""
+if [ -d OTHER_LIBC_DIR ] ; then
+ OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR"
+fi
-BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \
+BUILD/compile-pentium-max $OTHER_LIBC \
--with-comment="Official MySQL Binary" \
--prefix=/usr/local/mysql --with-extra-charset=complex \
--enable-thread-safe-client --enable-local-infile \