aboutsummaryrefslogtreecommitdiffstats
path: root/stubdom
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-05 14:40:19 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-05 14:40:19 +0000
commiteccb4696e8b0dfbe12b7983d0ef1bae61aa5f173 (patch)
treee3a0433d71f64d89eaa22f6dca662b24cc99312e /stubdom
parent2fcc5699d4f9f43e6edc78271123e42d051a0edc (diff)
downloadxen-eccb4696e8b0dfbe12b7983d0ef1bae61aa5f173.tar.gz
xen-eccb4696e8b0dfbe12b7983d0ef1bae61aa5f173.tar.bz2
xen-eccb4696e8b0dfbe12b7983d0ef1bae61aa5f173.zip
Fix Makefile targets that generate several files at once
In a few places in the tree the Makefiles have constructs like this: one_file another_file: $(COMMAND_WHICH_GENERATES_BOTH_AT_ONCE) This is wrong, because make will run _two copies_ of the same command at once. This generally causes races and hard-to-reproduce build failures. Notably, `make -j4' at the top level will build stubdom libxc twice simultaneously! In this patch we replace the occurrences of this construct with the correct idiom: one_file: another_file another_file: $(COMMAND_WHICH_GENERATES_BOTH_AT_ONCE) Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'stubdom')
-rw-r--r--stubdom/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 15048f08a1..43e8e9217b 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -265,9 +265,11 @@ $(TARGETS_MINIOS): mini-os-%:
.PHONY: libxc
libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a
-libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a:: cross-zlib
+libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib
CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C libxc-$(XEN_TARGET_ARCH)
+ libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a
+
#######
# ioemu
#######