aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-05-22 09:23:45 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-22 10:50:26 -0500
commit79eb76ade2ec09c7209662323650be41988ddb51 (patch)
tree4322423a9bb8db19d2c343d96cd1ef3efe6b5066
parent0c257437b25731d4f44985e4b30b7317f2845b4a (diff)
Revert "Fix arm-softmmu breakage"
This reverts commit ec6bd8dea77478f32981a5df49f66ca2430ad19d. This broke any target that uses virtio. Virtio devices live in libhw and without whole-archive, the constructors will never be called for virtio. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile.target4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index 959765ee33..4de29f831d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -709,8 +709,8 @@ endif
vl.o: qemu-options.h
-$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) libqemu.a $(HWLIB)
-$(QEMU_PROG): ARLIBS=../libqemu_common.a
+$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
+$(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB)
$(call LINK,$(OBJS))