| Message ID | 1329835480-22192-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 02/21/2012 08:44 AM, Peter Maydell wrote: > Make qemu-bridge-helper explicitly depend on $(GENERATED_HEADERS) > so that it doesn't fail to build when we configured for linux-user > targets only. (Build breakage introduced in commit 7b93fad.) > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> Applied. Thanks. Regards, Anthony Liguori > --- > I suspect we could handle generated headers better in our makefile > than having to scatter $(GENERATED_HEADERS) dependencies into almost > everything (eg "%.o: $(GENERATED_HEADERS)" ??) but this is the minimal > fix for the build breakage which we should apply for now I think. > > Makefile | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/Makefile b/Makefile > index e66e885..c67493e 100644 > --- a/Makefile > +++ b/Makefile > @@ -159,6 +159,7 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) > qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) > > qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o > +qemu-bridge-helper.o: $(GENERATED_HEADERS) > > fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) > fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
diff --git a/Makefile b/Makefile index e66e885..c67493e 100644 --- a/Makefile +++ b/Makefile @@ -159,6 +159,7 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o +qemu-bridge-helper.o: $(GENERATED_HEADERS) fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
Make qemu-bridge-helper explicitly depend on $(GENERATED_HEADERS) so that it doesn't fail to build when we configured for linux-user targets only. (Build breakage introduced in commit 7b93fad.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- I suspect we could handle generated headers better in our makefile than having to scatter $(GENERATED_HEADERS) dependencies into almost everything (eg "%.o: $(GENERATED_HEADERS)" ??) but this is the minimal fix for the build breakage which we should apply for now I think. Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)