diff mbox

[26/81] CLOCKLIBS was used for all binaries

Message ID f902cd540dce97d7c43bd79644a6a0581d5da576.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    2 --
 Makefile.target |    2 --
 configure       |    5 ++---
 3 files changed, 2 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 62f753b..1362b53 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,6 @@  else
 DOCS=
 endif

-LIBS+=$(CLOCKLIBS)
-
 ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
 endif
diff --git a/Makefile.target b/Makefile.target
index 9c7cabe..5d05e71 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -202,8 +202,6 @@  signal.o: CFLAGS += $(HELPER_CFLAGS)
 ARLIBS=../libqemu_user.a libqemu.a
 endif #CONFIG_LINUX_USER

-LIBS+= $(CLOCKLIBS)
-
 #########################################################
 # Darwin user emulator target

diff --git a/configure b/configure
index 94a5697..1d05169 100755
--- a/configure
+++ b/configure
@@ -1340,9 +1340,9 @@  int main(void) { clockid_t id; return clock_gettime(id, NULL); }
 EOF

 if compile_prog "" "" ; then
-  CLOCKLIBS=""
+  :
 elif compile_prog "" "-lrt" ; then
-  CLOCKLIBS="-lrt"
+  LIBS="-lrt $LIBS"
 fi

 # Determine what linker flags to use to force archive inclusion
@@ -1749,7 +1749,6 @@  echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
 echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
 echo "LIBS=$LIBS" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
-echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak

 echo "/* Automatically generated by configure - do not modify */" > $config_host_h