diff options
author | unknown <jani@hynda.mysql.fi> | 2007-08-22 17:29:38 +0300 |
---|---|---|
committer | unknown <jani@hynda.mysql.fi> | 2007-08-22 17:29:38 +0300 |
commit | b3dd7d5ca6f501210ca7f0f98c2029376c42e03c (patch) | |
tree | eb1ce9100b55c8b26a72392c57e84461668936c7 /BUILD/compile-solaris-sparc-forte | |
parent | 7dd4e789586bef5141e1a1d4da4b7efc271708aa (diff) | |
parent | edf4fccf98ce701a984e13e2c7bd174a15226ed4 (diff) | |
download | mariadb-git-b3dd7d5ca6f501210ca7f0f98c2029376c42e03c.tar.gz |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
client/mysqldump.c:
Auto merged
sql/event_db_repository.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_yacc.yy:
Manual merge with 5.1 main tree.
Diffstat (limited to 'BUILD/compile-solaris-sparc-forte')
-rwxr-xr-x | BUILD/compile-solaris-sparc-forte | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index 2a8b7dbae48..b9fffcb7fdd 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -3,7 +3,13 @@ # Assume Forte is installed in /opt/SUNWSpro and ld is installed in # /usr/ccs/bin -PATH=/opt/SUNWspro/bin/:/usr/ccs/bin:$PATH +PATH=/opt/SUNWspro/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:$PATH + +prefix="/usr/local/mysql" +if test -n "$MYSQL_BUILD_PREFIX" +then + prefix="$MYSQL_BUILD_PREFIX" +fi make -k maintainer-clean || true /bin/rm -f */.deps/*.P config.cache @@ -12,9 +18,9 @@ path=`dirname $0` . "$path/autorun.sh" # For "optimal" code for this computer add -fast to EXTRA -# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT +# To compile 32/64 bit, uncomment/comment EXTRA_64_BIT -EXTRA_64_BIT="-xarch=v9" # Remove comment to get 64 bit binaries +EXTRA_64_BIT="-m64" EXTRA="-fast" # Remove comment to target current machine # @@ -22,10 +28,9 @@ EXTRA="-fast" # Remove comment to target current machine # STD="-mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT" -ASFLAGS="$EXTRA_64_BIT" \ CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \ CXX=CC CXXFLAGS="-noex $STD" \ -./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client +./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --prefix=$PREFIX make -j 4 if [ $? = 0 ] |