diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-05 16:03:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-05 16:03:58 +0200 |
| commit | 215043b7c2ace7ce05dcf6c685c87a293ccf1cd7 (patch) | |
| tree | 679d57ddbf9713b7129872db144ff408b0215b31 /BUILD | |
| parent | 31a78529bc5c4431865eba06762e6cc66359f759 (diff) | |
| parent | 6b03fbf9fcacc74cb2999ba7715d22d754f356c7 (diff) | |
| download | mariadb-git-215043b7c2ace7ce05dcf6c685c87a293ccf1cd7.tar.gz | |
Merge with 5.1
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/compile-pentium64 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BUILD/compile-pentium64 b/BUILD/compile-pentium64 index 3a8fad51fea..01eb2adf88b 100755 --- a/BUILD/compile-pentium64 +++ b/BUILD/compile-pentium64 @@ -4,7 +4,10 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium64_cflags $fast_cflags" -extra_configs="$pentium_configs $static_link" +# On CentOS/Fedora Core 10 amd64, there is system libz.so but not +# libz.a, so need to use bundled zlib when building static +# binary. Hence we use --with-zlib-dir=bundled +extra_configs="$pentium_configs $static_link --with-zlib-dir=bundled" CC="$CC --pipe" strip=yes |