gwj / at91sam9263 · Commits

Commit 70956b7719f37c207610b6cd6f29be123414d360

Authored by ths
1 parent e1f63470

Better way to select -lrt, by Andrzei Zaborowski. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2486 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 10 additions and 6 deletions
Makefile
  View file @70956b7
@@ -24,11 +24,7 @@ else @@ -24,11 +24,7 @@ else
24 DOCS= 24 DOCS=
25 endif 25 endif
26 26
27 -ifndef CONFIG_DARWIN  
28 -ifndef CONFIG_WIN32  
29 -LIBS+=-lrt  
30 -endif  
31 -endif 27 +LIBS+=$(AIOLIBS)
32 28
33 all: $(TOOLS) $(DOCS) recurse-all 29 all: $(TOOLS) $(DOCS) recurse-all
34 30
Makefile.target
  View file @70956b7
@@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) @@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
431 endif 431 endif
432 432
433 VL_LDFLAGS= 433 VL_LDFLAGS=
  434 +VL_LIBS=$(AIOLIBS)
434 # specific flags are needed for non soft mmu emulator 435 # specific flags are needed for non soft mmu emulator
435 ifdef CONFIG_STATIC 436 ifdef CONFIG_STATIC
436 VL_LDFLAGS+=-static 437 VL_LDFLAGS+=-static
@@ -441,7 +442,7 @@ endif @@ -441,7 +442,7 @@ endif
441 ifndef CONFIG_DARWIN 442 ifndef CONFIG_DARWIN
442 ifndef CONFIG_WIN32 443 ifndef CONFIG_WIN32
443 ifndef CONFIG_SOLARIS 444 ifndef CONFIG_SOLARIS
444 -VL_LIBS=-lutil -lrt 445 +VL_LIBS+=-lutil
445 endif 446 endif
446 endif 447 endif
447 endif 448 endif
configure
  View file @70956b7
@@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then @@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then
159 fi 159 fi
160 fi 160 fi
161 161
  162 +if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
  163 + AIOLIBS=
  164 +else
  165 + AIOLIBS="-lrt"
  166 +fi
  167 +
162 # find source path 168 # find source path
163 source_path=`dirname "$0"` 169 source_path=`dirname "$0"`
164 if [ -z "$source_path" ]; then 170 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
658 echo "CFLAGS=$CFLAGS" >> $config_mak 664 echo "CFLAGS=$CFLAGS" >> $config_mak
659 echo "LDFLAGS=$LDFLAGS" >> $config_mak 665 echo "LDFLAGS=$LDFLAGS" >> $config_mak
660 echo "EXESUF=$EXESUF" >> $config_mak 666 echo "EXESUF=$EXESUF" >> $config_mak
  667 +echo "AIOLIBS=$AIOLIBS" >> $config_mak
661 if test "$cpu" = "i386" ; then 668 if test "$cpu" = "i386" ; then
662 echo "ARCH=i386" >> $config_mak 669 echo "ARCH=i386" >> $config_mak
663 echo "#define HOST_I386 1" >> $config_h 670 echo "#define HOST_I386 1" >> $config_h