mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/ocaml: fix build dependency target
They are two competiting spelling for the variable holding the path to
"tools/ocaml", $(TOPLEVEL) and $(OCAML_TOPLEVEL). The "Makefile.rules"
which is included in all ocaml Makefiles have one rule which make use
of that variable which is then sometime unset. When building
"ocaml/xenstored", make isn't capable of generating ".ocamldep.make"
because $(TOPLEVEL) isn't defined in this case.
This can fail with an error like this when paths.ml have been
regenerated:
Error: Files define.cmx and paths.cmx
make inconsistent assumptions over interface Paths
This patch fix ".ocamldep.make" rule by always spelling the variable
$(OCAML_TOPLEVEL).
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
This commit is contained in:
Anthony PERARD authored and Julien Grall committed
1 parent
41156021e2
commit
0c5304d14a
8 files changed
+29
-29
No files matched your search
@@ -44,7 +44,7 @@ META: META.in
|
||||
|
||||
ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $(ALL_OCAML_OBJS))
|
||||
|
||||
.ocamldep.make: $(ALL_OCAML_OBJ_SOURCES) Makefile $(TOPLEVEL)/Makefile.rules
|
||||
.ocamldep.make: $(ALL_OCAML_OBJ_SOURCES) Makefile $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
$(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli $o,MLDEP,)
|
||||
|
||||
clean: $(CLEAN_HOOKS)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_xeninclude)
|
||||
|
||||
@@ -31,5 +31,5 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xeneventchn
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
OBJS = xenmmap
|
||||
INTF = $(foreach obj, $(OBJS),$(obj).cmi)
|
||||
@@ -26,5 +26,5 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenmmap
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
CFLAGS += -I../mmap
|
||||
CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
|
||||
@@ -49,4 +49,4 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenbus
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
||||
CFLAGS += $(APPEND_CFLAGS)
|
||||
@@ -38,4 +38,4 @@ xenctrl_abi_check.h: abi-check xenctrl_stubs.c xenctrl.ml
|
||||
|
||||
GENERATED_FILES += xenctrl_abi_check.h
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
# allow mixed declarations and code
|
||||
CFLAGS += -Wno-declaration-after-statement
|
||||
@@ -62,4 +62,4 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
ocamlfind remove -destdir $(OCAMLDESTDIR) xentoollog
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
# ignore unused generated functions and allow mixed declarations and code
|
||||
CFLAGS += -Wno-unused -Wno-declaration-after-statement
|
||||
@@ -68,4 +68,4 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenlight
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(TOPLEVEL)/../..
|
||||
include $(TOPLEVEL)/common.make
|
||||
OCAML_TOPLEVEL=$(CURDIR)/../..
|
||||
XEN_ROOT=$(OCAML_TOPLEVEL)/../..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
OCAMLINCLUDE += -I ../xb/
|
||||
OCAMLOPTFLAGS += -for-pack Xenstore
|
||||
@@ -43,7 +43,7 @@ install: $(LIBS) META
|
||||
uninstall:
|
||||
$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore
|
||||
|
||||
include $(TOPLEVEL)/Makefile.rules
|
||||
include $(OCAML_TOPLEVEL)/Makefile.rules
|
||||
|
||||
genpath-target = $(call buildmakevars2module,paths.ml)
|
||||
$(eval $(genpath-target))
|
||||
|
||||