diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-07-12 09:29:18 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-07-12 09:29:18 +0000 |
| commit | db8d7dd17bff97aa6311c81a2940012b4c7681d9 (patch) | |
| tree | 8c02775d709e963f7cbb0018899c7dc4d3320f67 | |
| parent | b1f452387e27060fdf69f1979335336c52c4e58c (diff) | |
Fix configure for cygwin, by Tristan Gingold.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3074 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rwxr-xr-x | configure | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 67689cfef6..18b7949c60 100644 --- a/Makefile.target +++ b/Makefile.target @@ -494,7 +494,7 @@ tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) endif -VL_LDFLAGS= +VL_LDFLAGS=$(VL_OS_LDFLAGS) VL_LIBS=$(AIOLIBS) # specific flags are needed for non soft mmu emulator ifdef CONFIG_STATIC @@ -108,9 +108,16 @@ case $targetos in CYGWIN*) mingw32="yes" OS_CFLAGS="-mno-cygwin" +VL_OS_LDFLAGS="-mno-cygwin" +if [ "$cpu" = "i386" ] ; then + kqemu="yes" +fi ;; MINGW32*) mingw32="yes" +if [ "$cpu" = "i386" ] ; then + kqemu="yes" +fi ;; GNU/kFreeBSD) oss="yes" @@ -390,9 +397,6 @@ if test "$mingw32" = "yes" ; then linux="no" EXESUF=".exe" oss="no" - if [ "$cpu" = "i386" ] ; then - kqemu="yes" - fi fi # Check for gcc4, error if pre-gcc4 @@ -713,6 +717,7 @@ echo "AR=$ar" >> $config_mak echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak +echo "VL_OS_LDFLAGS=$VL_OS_LDFLAGS" >> $config_mak echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak |