summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>2011-08-14 15:30:44 +0200
committerDiego Elio Pettenò <flameeyes@flameeyes.eu>2011-08-14 15:32:26 +0200
commitfcf389099cbaaec94ed1e427a48c841890bad030 (patch)
tree23a4c1bbe42b663a8a0b58d37cbb0e46081765b1
parentMerge remote-tracking branch 'upstream/stable-0.15' into stable-0.15 (diff)
downloadqemu-kvm-fcf389099cbaaec94ed1e427a48c841890bad030.tar.gz
qemu-kvm-fcf389099cbaaec94ed1e427a48c841890bad030.tar.bz2
qemu-kvm-fcf389099cbaaec94ed1e427a48c841890bad030.zip
build: list libraries after objects, for proper linkageqemu-kvm-0.15.0-gentoo-1qemu-kvm-0.15.0-gentoo
Without this change, when using -Wl,--as-needed with GNU linker, the libraries would be discarded.
-rw-r--r--libcacard/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile
index 9802c37ee..bb40c027e 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -15,7 +15,7 @@ QEMU_CFLAGS+=-I../
libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y)))
vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o
- $(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^," LINK $@")
+ $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) -lrt," LINK $@")
clean:
rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la
@@ -34,7 +34,7 @@ install-libcacard:
@echo "libtool is missing, please install and rerun configure"; exit 1
else
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
- $(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) $(libcacard_libs) -lrt -rpath $(libdir) -o $@ $^," lt LINK $@")
+ $(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt," lt LINK $@")
install-libcacard: libcacard.la
$(INSTALL_DIR) "$(DESTDIR)$(libdir)"