You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/11/28 22:03:32 UTC
svn commit: r721561 - /xalan/c/trunk/runConfigure
Author: dbertoni
Date: Fri Nov 28 13:03:31 2008
New Revision: 721561
URL: http://svn.apache.org/viewvc?rev=721561&view=rev
Log:
Cleaned up pthread options to fix 64-bit build on Solaris x86. Cleaned up old 64-bit defines and removed unnecessary 32-bit build options.
Modified:
xalan/c/trunk/runConfigure
Modified: xalan/c/trunk/runConfigure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/runConfigure?rev=721561&r1=721560&r2=721561&view=diff
==============================================================================
--- xalan/c/trunk/runConfigure (original)
+++ xalan/c/trunk/runConfigure Fri Nov 28 13:03:31 2008
@@ -385,26 +385,24 @@
# freebsd | netbsd | openbsd | irix | os390 | os400 | tru64 | macosx
#
if test $bitsToBuild = 64; then
- bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
- bitstobuildLink=" "
+ bitstobuildDefines=""
+ bitstobuildLink=""
if test $platform; then
case $platform in
solaris)
- bitstobuildDefines=" $bitstobuildDefines -xarch=v9 "
+ bitstobuildDefines=" -xarch=v9 "
bitstobuildLink=" -xarch=v9 " ;;
solaris-x86)
- bitstobuildDefines=" $bitstobuildDefines -m64 "
+ bitstobuildDefines=" -m64 "
bitstobuildLink=" -m64 " ;;
aix)
- bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 " ;;
+ bitstobuildDefines=" -q64 -qwarn64 " ;;
hp-11)
- bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
+ bitstobuildDefines=" +DA2.0W "
bitstobuildLink=" +DA2.0W " ;;
hp-11-ia64)
- bitstobuildDefines=" $bitstobuildDefines +DD64 "
+ bitstobuildDefines=" +DD64 "
bitstobuildLink=" +DD64 " ;;
- linux)
- bitstobuildDefines=" $bitstobuildDefines " ;;
*)
;;
esac
@@ -412,24 +410,6 @@
elif test $bitsToBuild = 32; then
bitstobuildDefines=""
bitstobuildLink=""
- if test $platform; then
- case $platform in
- solaris)
- ;;
- aix)
- ;;
- hp-11)
- bitstobuildDefines="+DAportable "
- ;;
- hp-11-ia64)
- bitstobuildDefines="+DD32 "
- ;;
- linux)
- ;;
- *)
- ;;
- esac
- fi
else
echo "I do not recognize the bitsToBuild '$bitsToBuild'. Please type '${0} -h' for help."
exit ${ERROR_EXIT_CODE};
@@ -629,7 +609,7 @@
threadingDefines="-D_OPEN_THREADS"
;;
- solaris)
+ solaris*)
if test $ccompiler = "gcc"; then
# GCC on Solaris uses "-pthreads" instead of
# "-pthread"
@@ -637,7 +617,6 @@
threadingLibs=$gccThreadingLibs
else
threadingDefines="-mt"
- threadingLibs="-lpthread"
fi
;;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org