Commit 8281db4db9f8a57e30eb4becf955bb0d4d6c5281
1 parent
d5db4246
Add -m64 to OS_LDFLAGS for Solaris/x86_64. Use OS_CFLAGS when looking for
libSDL. Patch by Ben Taylor. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3695 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
2 deletions
configure
| ... | ... | @@ -364,6 +364,7 @@ esac |
| 364 | 364 | if [ "$solaris" = "yes" -a "$cpu" = "x86_64" ] ; then |
| 365 | 365 | CFLAGS="${CFLAGS} -m64" |
| 366 | 366 | OS_CFLAGS="${OS_CFLAGS} -m64" |
| 367 | + OS_LDFLAGS="${OS_LDFLAGS} -m64" | |
| 367 | 368 | fi |
| 368 | 369 | |
| 369 | 370 | if [ "$solaris" = "yes" -a "$cpu" = "i386" ] ; then |
| ... | ... | @@ -599,7 +600,7 @@ cat > $TMPC << EOF |
| 599 | 600 | #undef main /* We don't want SDL to override our main() */ |
| 600 | 601 | int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } |
| 601 | 602 | EOF |
| 602 | - if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then | |
| 603 | + if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then | |
| 603 | 604 | _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` |
| 604 | 605 | if test "$_sdlversion" -lt 121 ; then |
| 605 | 606 | sdl_too_old=yes |
| ... | ... | @@ -618,7 +619,7 @@ EOF |
| 618 | 619 | sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`" |
| 619 | 620 | fi |
| 620 | 621 | |
| 621 | - if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then | |
| 622 | + if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then | |
| 622 | 623 | sdl_static=yes |
| 623 | 624 | fi |
| 624 | 625 | fi # static link | ... | ... |