diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-03-17 15:00:37 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-03-17 15:00:37 +0000 |
| commit | 70956b7719f37c207610b6cd6f29be123414d360 (patch) | |
| tree | ca0d7f3cb1b8646fe8b6545a4d077211307ea117 | |
| parent | e1f63470e96665b13d8a71ce8df520ab64fdcb12 (diff) | |
| download | qemu-70956b7719f37c207610b6cd6f29be123414d360.zip | |
Better way to select -lrt, by Andrzei Zaborowski.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2486 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.target | 3 | ||||
| -rwxr-xr-x | configure | 7 |
3 files changed, 10 insertions, 6 deletions
@@ -24,11 +24,7 @@ else DOCS= endif -ifndef CONFIG_DARWIN -ifndef CONFIG_WIN32 -LIBS+=-lrt -endif -endif +LIBS+=$(AIOLIBS) all: $(TOOLS) $(DOCS) recurse-all diff --git a/Makefile.target b/Makefile.target index 8eaa8dd787..9f7a804a4f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) endif VL_LDFLAGS= +VL_LIBS=$(AIOLIBS) # specific flags are needed for non soft mmu emulator ifdef CONFIG_STATIC VL_LDFLAGS+=-static @@ -441,7 +442,7 @@ endif ifndef CONFIG_DARWIN ifndef CONFIG_WIN32 ifndef CONFIG_SOLARIS -VL_LIBS=-lutil -lrt +VL_LIBS+=-lutil endif endif endif @@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then fi fi +if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then + AIOLIBS= +else + AIOLIBS="-lrt" +fi + # find source path source_path=`dirname "$0"` if [ -z "$source_path" ]; then @@ -658,6 +664,7 @@ echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak echo "LDFLAGS=$LDFLAGS" >> $config_mak echo "EXESUF=$EXESUF" >> $config_mak +echo "AIOLIBS=$AIOLIBS" >> $config_mak if test "$cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h |