Ian Campbell
2011-Mar-31 10:41 UTC
[Xen-devel] [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings
# HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1301568069 -3600 # Node ID ae7532099ea5045278c9dcf8a593da497722a11f # Parent 43ecf2418e94e89ea4fc28252e4710e7eee56098 tools: ocaml: push CFLAGS usage down into the specific bindings So each binding only builds against what it requires. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/common.make --- a/tools/ocaml/common.make Thu Mar 31 11:34:35 2011 +0100 +++ b/tools/ocaml/common.make Thu Mar 31 11:41:09 2011 +0100 @@ -9,7 +9,6 @@ OCAMLLEX ?= ocamllex OCAMLYACC ?= ocamlyacc CFLAGS += -fPIC -Werror -CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_libxenlight) CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/eventchn/Makefile --- a/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 11:34:35 2011 +0100 +++ b/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 11:41:09 2011 +0100 @@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) + OBJS = eventchn INTF = $(foreach obj, $(OBJS),$(obj).cmi) LIBS = eventchn.cma eventchn.cmxa diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/xb/Makefile --- a/tools/ocaml/libs/xb/Makefile Thu Mar 31 11:34:35 2011 +0100 +++ b/tools/ocaml/libs/xb/Makefile Thu Mar 31 11:41:09 2011 +0100 @@ -3,6 +3,8 @@ XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make CFLAGS += -I../mmap +CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb() +CFLAGS += $(CFLAGS_xeninclude) OCAMLINCLUDE += -I ../mmap .NOTPARALLEL: diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/xl/Makefile --- a/tools/ocaml/libs/xl/Makefile Thu Mar 31 11:34:35 2011 +0100 +++ b/tools/ocaml/libs/xl/Makefile Thu Mar 31 11:41:09 2011 +0100 @@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make +CFLAGS += $(CFLAGS_libxenlight) + OBJS = xl INTF = xl.cmi LIBS = xl.cma xl.cmxa _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Mar-31 18:31 UTC
Re: [Xen-devel] [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings [and 2 more messages]
Ian Campbell writes ("[Xen-devel] [PATCH] tools: ocaml: push CFLAGS usage
down into the specific bindings"):> tools: ocaml: push CFLAGS usage down into the specific bindings
> tools: ocaml: drop some commented out build rules.
> tools: ocaml: drop redefinition of xen_mb
Applied these three.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel