提交 db8d7dd1 编写于 作者: T ths

Fix configure for cygwin, by Tristan Gingold.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3074 c046a42c-6fe2-441c-8c8c-71466251a162
上级 b1f45238
...@@ -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
VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
endif endif
VL_LDFLAGS= VL_LDFLAGS=$(VL_OS_LDFLAGS)
VL_LIBS=$(AIOLIBS) VL_LIBS=$(AIOLIBS)
# specific flags are needed for non soft mmu emulator # specific flags are needed for non soft mmu emulator
ifdef CONFIG_STATIC ifdef CONFIG_STATIC
......
...@@ -108,9 +108,16 @@ case $targetos in ...@@ -108,9 +108,16 @@ case $targetos in
CYGWIN*) CYGWIN*)
mingw32="yes" mingw32="yes"
OS_CFLAGS="-mno-cygwin" OS_CFLAGS="-mno-cygwin"
VL_OS_LDFLAGS="-mno-cygwin"
if [ "$cpu" = "i386" ] ; then
kqemu="yes"
fi
;; ;;
MINGW32*) MINGW32*)
mingw32="yes" mingw32="yes"
if [ "$cpu" = "i386" ] ; then
kqemu="yes"
fi
;; ;;
GNU/kFreeBSD) GNU/kFreeBSD)
oss="yes" oss="yes"
...@@ -390,9 +397,6 @@ if test "$mingw32" = "yes" ; then ...@@ -390,9 +397,6 @@ if test "$mingw32" = "yes" ; then
linux="no" linux="no"
EXESUF=".exe" EXESUF=".exe"
oss="no" oss="no"
if [ "$cpu" = "i386" ] ; then
kqemu="yes"
fi
fi fi
# Check for gcc4, error if pre-gcc4 # 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
echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
echo "OS_LDFLAGS=$OS_LDFLAGS" >> $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_CFLAGS=$ARCH_CFLAGS" >> $config_mak
echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
echo "CFLAGS=$CFLAGS" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册