aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-09-15 17:10:43 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-09-15 17:10:43 +0100
commit689db5e9fbb77b9f968d4e8f47c26aea67faf1f3 (patch)
tree470c0fe3d50fd04dbad5548d60e07365de2ed3c5 /Makefile
parentc694aed7c42e6f46de4afabdbe2c19734918d531 (diff)
downloadxen-689db5e9fbb77b9f968d4e8f47c26aea67faf1f3.tar.gz
xen-689db5e9fbb77b9f968d4e8f47c26aea67faf1f3.tar.bz2
xen-689db5e9fbb77b9f968d4e8f47c26aea67faf1f3.zip
Avoid parallel invocation of git for ioemu-remote.
The stubdom and tools directories both run `make ioemu-dir-find' in tools. In a parallel build, both these invocations can run concurrently because we're doing recursive make. This change fixes this problem by adding a suitable dependencies in the top-level Makefile for the recursion into tools/ and stubdom/, ensuring that the git fetch happens once, first. The bug was introduced in 18472/18474. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3fbdb4646c..cf221adae5 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ install-xen:
$(MAKE) -C xen install
.PHONY: install-tools
-install-tools:
+install-tools: tools/ioemu-dir
$(MAKE) -C tools install
.PHONY: install-kernels
@@ -72,12 +72,15 @@ install-kernels:
for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
.PHONY: install-stubdom
-install-stubdom:
+install-stubdom: tools/ioemu-dir
$(MAKE) -C stubdom install
ifeq (x86_64,$(XEN_TARGET_ARCH))
XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
endif
+tools/ioemu-dir:
+ make -C tools ioemu-dir-find
+
.PHONY: install-docs
install-docs:
sh ./docs/check_pkgs && $(MAKE) -C docs install || true