diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-13 22:21:47 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-13 22:21:47 +0100 |
| commit | 88ca2a5988d8712caf04406f08cfbf09f09101ab (patch) | |
| tree | 45d2381e2aa40f463e4585e5c292362f8a1fe4e2 | |
| parent | 55616505876d6683130076b810a27c7889321560 (diff) | |
| download | qemu-88ca2a5988d8712caf04406f08cfbf09f09101ab.tar.gz | |
Add tool_osdep.c
osdep.c is built in both as a toplevel target independant object, and
as a per-target object because of kqemu dependencies. Under some
circumstances make picks up the wrong one.
Build the former as tool-osdep to avoid this conflict.
Signed-off-by: Paul Brook <paul@codesourcery.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | osdep.c | 3 | ||||
| -rw-r--r-- | tool-osdep.c | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -222,11 +222,11 @@ libqemu_user.a: $(USER_OBJS) ###################################################################### -qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS) qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz @@ -33,6 +33,9 @@ #include <sys/statvfs.h> #endif +/* FIXME: This file should be target independent. However it has kqemu + hacks, so must be built for every target. */ + /* Needed early for HOST_BSD etc. */ #include "config-host.h" diff --git a/tool-osdep.c b/tool-osdep.c new file mode 100644 index 0000000000..24e6edf9e0 --- /dev/null +++ b/tool-osdep.c @@ -0,0 +1,4 @@ +/* Hack to provide a version of osdep.o for qemu-img without conflicting with + the (kqemu) target specific osdep.o. */ +#include "osdep.c" + |