提交 70956b77 编写于 作者: T ths

Better way to select -lrt, by Andrzei Zaborowski.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2486 c046a42c-6fe2-441c-8c8c-71466251a162
上级 e1f63470
...@@ -24,11 +24,7 @@ else ...@@ -24,11 +24,7 @@ else
DOCS= DOCS=
endif endif
ifndef CONFIG_DARWIN LIBS+=$(AIOLIBS)
ifndef CONFIG_WIN32
LIBS+=-lrt
endif
endif
all: $(TOOLS) $(DOCS) recurse-all all: $(TOOLS) $(DOCS) recurse-all
......
...@@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) ...@@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
endif endif
VL_LDFLAGS= VL_LDFLAGS=
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
VL_LDFLAGS+=-static VL_LDFLAGS+=-static
...@@ -441,7 +442,7 @@ endif ...@@ -441,7 +442,7 @@ endif
ifndef CONFIG_DARWIN ifndef CONFIG_DARWIN
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
ifndef CONFIG_SOLARIS ifndef CONFIG_SOLARIS
VL_LIBS=-lutil -lrt VL_LIBS+=-lutil
endif endif
endif endif
endif endif
......
...@@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then ...@@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then
fi fi
fi fi
if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
AIOLIBS=
else
AIOLIBS="-lrt"
fi
# find source path # find source path
source_path=`dirname "$0"` source_path=`dirname "$0"`
if [ -z "$source_path" ]; then if [ -z "$source_path" ]; then
...@@ -658,6 +664,7 @@ echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak ...@@ -658,6 +664,7 @@ echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
echo "CFLAGS=$CFLAGS" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak
echo "LDFLAGS=$LDFLAGS" >> $config_mak echo "LDFLAGS=$LDFLAGS" >> $config_mak
echo "EXESUF=$EXESUF" >> $config_mak echo "EXESUF=$EXESUF" >> $config_mak
echo "AIOLIBS=$AIOLIBS" >> $config_mak
if test "$cpu" = "i386" ; then if test "$cpu" = "i386" ; then
echo "ARCH=i386" >> $config_mak echo "ARCH=i386" >> $config_mak
echo "#define HOST_I386 1" >> $config_h echo "#define HOST_I386 1" >> $config_h
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
新手
引导
客服 返回
顶部