aboutsummaryrefslogtreecommitdiffstats
path: root/stubdom
diff options
context:
space:
mode:
authorPatrick Colp <pjcolp@cs.ubc.ca>2010-09-21 17:54:43 +0100
committerPatrick Colp <pjcolp@cs.ubc.ca>2010-09-21 17:54:43 +0100
commit80da7630766e612dc7a8c793f9098d0c0c2f511b (patch)
tree4b1ddc4f8a236dd2d32f64320b9f2ec34fe48fd8 /stubdom
parent7225bfbd19c365bafb7e30c02480bc6497d376db (diff)
downloadxen-80da7630766e612dc7a8c793f9098d0c0c2f511b.tar.gz
xen-80da7630766e612dc7a8c793f9098d0c0c2f511b.tar.bz2
xen-80da7630766e612dc7a8c793f9098d0c0c2f511b.zip
tools/ocaml: Fix caml-stubdom make line to depend on the ocaml cross compiler
The provided sample caml stubdom needs to use the ocaml cross compiler, but if it hasn't been downloaded and compiled, then it won't find it and the build will fail. This makes caml-stubdom depend on the cross compiler, so it will automatically get built before the stubdom. Signed-off-by: Patrick Colp <pjcolp@cs.ubc.ca> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'stubdom')
-rw-r--r--stubdom/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile
index aee3592d70..5525e83cfb 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -334,7 +334,7 @@ ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) libxc io
DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_QEMU $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)"
.PHONY: caml-stubdom
-caml-stubdom: mini-os-$(XEN_TARGET_ARCH)-caml lwip-$(XEN_TARGET_ARCH) libxc caml
+caml-stubdom: mini-os-$(XEN_TARGET_ARCH)-caml lwip-$(XEN_TARGET_ARCH) libxc cross-ocaml caml
DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_CAML $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(CURDIR)/caml/main-caml.o $(CURDIR)/caml/caml.o $(CAMLLIB)/libasmrun.a"
.PHONY: c-stubdom