mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tool_osdep.c

Browse Source 
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>
This commit is contained in:
Paul Brook 2009-05-13 22:21:47 +01:00
parent 5561650587
commit 88ca2a5988
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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 qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz

3
osdep.c
View File

@ -33,6 +33,9 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#endif #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. */ /* Needed early for HOST_BSD etc. */
#include "config-host.h" #include "config-host.h"

4
tool-osdep.c Normal file
View File

@ -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"