[jbossnative-commits] JBoss Native SVN: r2658 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2010-04-14 04:43:55 -0400 (Wed, 14 Apr 2010)
New Revision: 2658
Modified:
trunk/build/unix/build.sh
Log:
Add logic for x64 on Solaris10 intel.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2010-04-13 08:58:55 UTC (rev 2657)
+++ trunk/build/unix/build.sh 2010-04-14 08:43:55 UTC (rev 2658)
@@ -262,16 +262,6 @@
BUILD_CPU=`uname -m`
fi
case ${BUILD_CPU} in
- sun4u*|sun4v*)
- if $force_64; then
- CFLAGS="-m64 -xcode=abs64"
- export CFLAGS
- LDFLAGS=-m64
- export LDFLAGS
- fi
- ;;
-esac
-case ${BUILD_CPU} in
sun4u*)
BUILD_CPU=sparcv9
;;
@@ -329,6 +319,13 @@
if $has_expat; then
build_expat=true
fi
+ # Solaris compiler could do 32 or 64 bits.
+ if $force_64; then
+ CFLAGS="-m64 -xcode=abs64"
+ export CFLAGS
+ LDFLAGS=-m64
+ export LDFLAGS
+ fi
;;
Darwin*)
BUILD_SYS="macosx"
@@ -658,7 +655,11 @@
fi
;;
solaris-x86)
- ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} solaris-x86-cc
|| exit 1
+ if $force_64; then
+ ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags}
solaris64-x86_64-cc || exit 1
+ else
+ ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} solaris-x86-cc
|| exit 1
+ fi
;;
macosx-x86)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} darwin-i386-cc
|| exit 1