mirror of
https://github.com/MariaDB/server.git
synced 2026-04-17 13:55:32 +02:00
Merge commit from 10.1:
commit 4165961d54
Author: Sergei Golubchik <serg@mariadb.org> Fri Oct 16 02:07:06 2015
Committer: Sergei Golubchik <serg@mariadb.org> Mon Nov 16 08:55:55 2015
disable innodb on sol10-64
because buildbot config invokes BUILD/compile-solaris-amd64
with the --extra-args=--without-plugin-innodb argument, but
BUILD/compile-solaris-amd64 doesn't take arguments and doesn't
invoke configure.pl, so this extra-args is lost.
This commit is contained in:
parent
a80dbe068c
commit
c3c4d55e7e
1 changed files with 1 additions and 1 deletions
|
|
@ -3,6 +3,6 @@
|
|||
export LDFLAGS='-m64 -lmtmalloc -R/usr/sfw/lib/64'
|
||||
export CFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64'
|
||||
export CXXFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64'
|
||||
cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_ZLIB=bundled
|
||||
cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_ZLIB=bundled -DPLUGIN_INNOBASE=NO
|
||||
gmake -j6 VERBOSE=1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue