summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authorlenz@mysql.com <>2002-05-15 11:06:44 +0200
committerlenz@mysql.com <>2002-05-15 11:06:44 +0200
commit0fe3b5afbd3ce807e38eca8376b40ddc4f1e2362 (patch)
tree5325913f53f6cbe83961b41466be6e64c99af64d /Build-tools
parent14b55bcc72554f3f356df4e7b1d8e7c8244de959 (diff)
downloadmariadb-git-0fe3b5afbd3ce807e38eca8376b40ddc4f1e2362.tar.gz
Fixed sql_yacc.yy to be compatible with bison 1.31 and above.
Made detection of GNU tar a bit more flexible. Only use /usr/local/mysql-glibc if it actually exists
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Do-linux-build9
1 files changed, 8 insertions, 1 deletions
diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build
index e5b0a49fe75..7a1fc426a30 100755
--- a/Build-tools/Do-linux-build
+++ b/Build-tools/Do-linux-build
@@ -1,9 +1,16 @@
#! /bin/sh
set -e -x
+
+# Only use the "--with-other-libc" parameter, if another libc actually
+# exists at this location
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 \