Re: [Xen-devel] [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS

[Dave Scott <Dave.Scott@xxxxxxxxxx>]

Looks good to me.

Acked-by: David Scott <dave.scott@xxxxxxxxxx>

On 6 Oct 2014, at 14:22, Olaf Hering <olaf@xxxxxxxxx> wrote:

> While implementing the --enable-rpath change I noticed that a ocaml
> build does not use APPEND_LDFLAGS. Make use of APPEND_CFLAGS and
> APPEND_LDFLAGS as it is done already in other places.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> Cc: David Scott <dave.scott@xxxxxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
> tools/ocaml/libs/xb/Makefile         | 1 +
> tools/ocaml/libs/xc/Makefile         | 1 +
> tools/ocaml/libs/xentoollog/Makefile | 1 +
> tools/ocaml/libs/xl/Makefile         | 1 +
> tools/ocaml/test/Makefile            | 1 +
> tools/ocaml/xenstored/Makefile       | 2 ++
> 6 files changed, 7 insertions(+)
> 
> diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
> index 62ffefb..09d1bc8 100644
> --- a/tools/ocaml/libs/xb/Makefile
> +++ b/tools/ocaml/libs/xb/Makefile
> @@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
> CFLAGS += -I../mmap
> CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
> CFLAGS += $(CFLAGS_xeninclude)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE += -I ../mmap
> OCAMLOPTFLAGS += -for-pack Xenbus
> 
> diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
> index 239c187..d24b014 100644
> --- a/tools/ocaml/libs/xc/Makefile
> +++ b/tools/ocaml/libs/xc/Makefile
> @@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
> include $(TOPLEVEL)/common.make
> 
> CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE += -I ../mmap
> 
> OBJS = xenctrl
> diff --git a/tools/ocaml/libs/xentoollog/Makefile 
> b/tools/ocaml/libs/xentoollog/Makefile
> index f2134b8..666eb66 100644
> --- a/tools/ocaml/libs/xentoollog/Makefile
> +++ b/tools/ocaml/libs/xentoollog/Makefile
> @@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
> CFLAGS += -Wno-declaration-after-statement
> 
> CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE +=
> 
> OBJS = xentoollog
> diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
> index 61eb44c..0d1549d 100644
> --- a/tools/ocaml/libs/xl/Makefile
> +++ b/tools/ocaml/libs/xl/Makefile
> @@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
> 
> CFLAGS += $(CFLAGS_libxenlight)
> CFLAGS += -I ../xentoollog
> +CFLAGS += $(APPEND_CFLAGS)
> 
> OBJS = xenlight
> INTF = xenlight.cmi
> diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
> index 8033089..b75726f 100644
> --- a/tools/ocaml/test/Makefile
> +++ b/tools/ocaml/test/Makefile
> @@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
> include $(OCAML_TOPLEVEL)/common.make
> 
> CFLAGS += $(CFLAGS_libxenlight)
> +CFLAGS += $(APPEND_CFLAGS)
> LIBS_xenlight = $(LDLIBS_libxenlight)
> 
> OCAMLINCLUDE += \
> diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
> index 068e04a..ec19709 100644
> --- a/tools/ocaml/xenstored/Makefile
> +++ b/tools/ocaml/xenstored/Makefile
> @@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD)  += $(SYSTEMD_CFLAGS)
> LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
> 
> CFLAGS  += $(CFLAGS-y)
> +CFLAGS  += $(APPEND_CFLAGS)
> LDFLAGS += $(LDFLAGS-y)
> +LDFLAGS += $(APPEND_LDFLAGS)
> 
> OCAMLINCLUDE += \
>       -I $(OCAML_TOPLEVEL)/libs/xb \


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel