Commit 88ca2a59 authored May 13, 2009 by Paul Brook

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>

parent 55616505

Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

osdep.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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"

tool-osdep.c

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		/* Hack to provide a version of osdep.o for qemu-img without conflicting with
		the (kqemu) target specific osdep.o. */
		#include "osdep.c"