Commit ef18c8839e85341cc63467f92c35f981858a6fe5
1 parent
ec36ba14
Solaris x86_64 configure patch, by Ben Taylor.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3176 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
16 additions
and
0 deletions
configure
| @@ -155,6 +155,12 @@ SunOS) | @@ -155,6 +155,12 @@ SunOS) | ||
| 155 | install="ginstall" | 155 | install="ginstall" |
| 156 | needs_libsunmath="no" | 156 | needs_libsunmath="no" |
| 157 | solarisrev=`uname -r | cut -f2 -d.` | 157 | solarisrev=`uname -r | cut -f2 -d.` |
| 158 | + # have to select again, because `uname -m` returns i86pc | ||
| 159 | + # even on an x86_64 box. | ||
| 160 | + solariscpu=`isainfo -k` | ||
| 161 | + if test "${solariscpu}" = "amd64" ; then | ||
| 162 | + cpu="x86_64" | ||
| 163 | + fi | ||
| 158 | if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then | 164 | if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then |
| 159 | if test "$solarisrev" -le 9 ; then | 165 | if test "$solarisrev" -le 9 ; then |
| 160 | if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then | 166 | if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then |
| @@ -333,6 +339,16 @@ case $cpu in | @@ -333,6 +339,16 @@ case $cpu in | ||
| 333 | ;; | 339 | ;; |
| 334 | esac | 340 | esac |
| 335 | 341 | ||
| 342 | +if [ "$solaris" = "yes" -a "$cpu" = "x86_64" ] ; then | ||
| 343 | + CFLAGS="${CFLAGS} -m64" | ||
| 344 | + OS_CFLAGS="${OS_CFLAGS} -m64" | ||
| 345 | +fi | ||
| 346 | + | ||
| 347 | +if [ "$solaris" = "yes" -a "$cpu" = "i386" ] ; then | ||
| 348 | + CFLAGS="${CFLAGS} -m32" | ||
| 349 | + OS_CFLAGS="${OS_CFLAGS} -m32" | ||
| 350 | +fi | ||
| 351 | + | ||
| 336 | if test x"$show_help" = x"yes" ; then | 352 | if test x"$show_help" = x"yes" ; then |
| 337 | cat << EOF | 353 | cat << EOF |
| 338 | 354 |