Commit db8d7dd17bff97aa6311c81a2940012b4c7681d9
1 parent
b1f45238
Fix configure for cygwin, by Tristan Gingold.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3074 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
9 additions
and
4 deletions
Makefile.target
| @@ -494,7 +494,7 @@ tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o | @@ -494,7 +494,7 @@ tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o | ||
| 494 | VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) | 494 | VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) |
| 495 | endif | 495 | endif |
| 496 | 496 | ||
| 497 | -VL_LDFLAGS= | 497 | +VL_LDFLAGS=$(VL_OS_LDFLAGS) |
| 498 | VL_LIBS=$(AIOLIBS) | 498 | VL_LIBS=$(AIOLIBS) |
| 499 | # specific flags are needed for non soft mmu emulator | 499 | # specific flags are needed for non soft mmu emulator |
| 500 | ifdef CONFIG_STATIC | 500 | ifdef CONFIG_STATIC |
configure
| @@ -108,9 +108,16 @@ case $targetos in | @@ -108,9 +108,16 @@ case $targetos in | ||
| 108 | CYGWIN*) | 108 | CYGWIN*) |
| 109 | mingw32="yes" | 109 | mingw32="yes" |
| 110 | OS_CFLAGS="-mno-cygwin" | 110 | OS_CFLAGS="-mno-cygwin" |
| 111 | +VL_OS_LDFLAGS="-mno-cygwin" | ||
| 112 | +if [ "$cpu" = "i386" ] ; then | ||
| 113 | + kqemu="yes" | ||
| 114 | +fi | ||
| 111 | ;; | 115 | ;; |
| 112 | MINGW32*) | 116 | MINGW32*) |
| 113 | mingw32="yes" | 117 | mingw32="yes" |
| 118 | +if [ "$cpu" = "i386" ] ; then | ||
| 119 | + kqemu="yes" | ||
| 120 | +fi | ||
| 114 | ;; | 121 | ;; |
| 115 | GNU/kFreeBSD) | 122 | GNU/kFreeBSD) |
| 116 | oss="yes" | 123 | oss="yes" |
| @@ -390,9 +397,6 @@ if test "$mingw32" = "yes" ; then | @@ -390,9 +397,6 @@ if test "$mingw32" = "yes" ; then | ||
| 390 | linux="no" | 397 | linux="no" |
| 391 | EXESUF=".exe" | 398 | EXESUF=".exe" |
| 392 | oss="no" | 399 | oss="no" |
| 393 | - if [ "$cpu" = "i386" ] ; then | ||
| 394 | - kqemu="yes" | ||
| 395 | - fi | ||
| 396 | fi | 400 | fi |
| 397 | 401 | ||
| 398 | # Check for gcc4, error if pre-gcc4 | 402 | # Check for gcc4, error if pre-gcc4 |
| @@ -713,6 +717,7 @@ echo "AR=$ar" >> $config_mak | @@ -713,6 +717,7 @@ echo "AR=$ar" >> $config_mak | ||
| 713 | echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak | 717 | echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak |
| 714 | echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak | 718 | echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak |
| 715 | echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak | 719 | echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak |
| 720 | +echo "VL_OS_LDFLAGS=$VL_OS_LDFLAGS" >> $config_mak | ||
| 716 | echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak | 721 | echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak |
| 717 | echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak | 722 | echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak |
| 718 | echo "CFLAGS=$CFLAGS" >> $config_mak | 723 | echo "CFLAGS=$CFLAGS" >> $config_mak |