aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:17 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:38 -0500
commit07ffa4bde62fd990783c692df523b938c9eeebbf (patch)
tree3cd2544c2594be8e69c1c433a02ec2457cfec136
parent5572b539261b8821263e82c2285727e1d032ed16 (diff)
CLOCKLIBS was used for all binaries
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
-rwxr-xr-xconfigure5
3 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 2f74f2599d..75df24a73d 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 47343bb5ba..090efb0078 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 aadc1d2820..0f76f089c9 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