Commit 79eb76ade2ec09c7209662323650be41988ddb51
1 parent
0c257437
Revert "Fix arm-softmmu breakage"
This reverts commit ec6bd8de. 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>
Showing
1 changed file
with
2 additions
and
2 deletions
Makefile.target
| @@ -709,8 +709,8 @@ endif | @@ -709,8 +709,8 @@ endif | ||
| 709 | 709 | ||
| 710 | vl.o: qemu-options.h | 710 | vl.o: qemu-options.h |
| 711 | 711 | ||
| 712 | -$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) libqemu.a $(HWLIB) | ||
| 713 | -$(QEMU_PROG): ARLIBS=../libqemu_common.a | 712 | +$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) |
| 713 | +$(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) | ||
| 714 | $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB) | 714 | $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB) |
| 715 | $(call LINK,$(OBJS)) | 715 | $(call LINK,$(OBJS)) |
| 716 | 716 |