mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS
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@aepfle.de> Cc: David Scott <dave.scott@eu.citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: David Scott <dave.scott@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
59182cf4f3
commit
a547da77cd
6 files changed
+7
No files matched your search
@@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
|
|||||||
CFLAGS += -I../mmap
|
CFLAGS += -I../mmap
|
||||||
CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
|
CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
|
||||||
CFLAGS += $(CFLAGS_xeninclude)
|
CFLAGS += $(CFLAGS_xeninclude)
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
OCAMLINCLUDE += -I ../mmap
|
OCAMLINCLUDE += -I ../mmap
|
||||||
OCAMLOPTFLAGS += -for-pack Xenbus
|
OCAMLOPTFLAGS += -for-pack Xenbus
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
|
|||||||
include $(TOPLEVEL)/common.make
|
include $(TOPLEVEL)/common.make
|
||||||
|
|
||||||
CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
OCAMLINCLUDE += -I ../mmap
|
OCAMLINCLUDE += -I ../mmap
|
||||||
|
|
||||||
OBJS = xenctrl
|
OBJS = xenctrl
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
|
|||||||
CFLAGS += -Wno-declaration-after-statement
|
CFLAGS += -Wno-declaration-after-statement
|
||||||
|
|
||||||
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
OCAMLINCLUDE +=
|
OCAMLINCLUDE +=
|
||||||
|
|
||||||
OBJS = xentoollog
|
OBJS = xentoollog
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
|
|||||||
|
|
||||||
CFLAGS += $(CFLAGS_libxenlight)
|
CFLAGS += $(CFLAGS_libxenlight)
|
||||||
CFLAGS += -I ../xentoollog
|
CFLAGS += -I ../xentoollog
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
|
|
||||||
OBJS = xenlight
|
OBJS = xenlight
|
||||||
INTF = xenlight.cmi
|
INTF = xenlight.cmi
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
|
|||||||
include $(OCAML_TOPLEVEL)/common.make
|
include $(OCAML_TOPLEVEL)/common.make
|
||||||
|
|
||||||
CFLAGS += $(CFLAGS_libxenlight)
|
CFLAGS += $(CFLAGS_libxenlight)
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
LIBS_xenlight = $(LDLIBS_libxenlight)
|
LIBS_xenlight = $(LDLIBS_libxenlight)
|
||||||
|
|
||||||
OCAMLINCLUDE += \
|
OCAMLINCLUDE += \
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
|
|||||||
LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
|
LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
|
||||||
|
|
||||||
CFLAGS += $(CFLAGS-y)
|
CFLAGS += $(CFLAGS-y)
|
||||||
|
CFLAGS += $(APPEND_CFLAGS)
|
||||||
LDFLAGS += $(LDFLAGS-y)
|
LDFLAGS += $(LDFLAGS-y)
|
||||||
|
LDFLAGS += $(APPEND_LDFLAGS)
|
||||||
|
|
||||||
OCAMLINCLUDE += \
|
OCAMLINCLUDE += \
|
||||||
-I $(OCAML_TOPLEVEL)/libs/xb \
|
-I $(OCAML_TOPLEVEL)/libs/xb \
|
||||||
|
|||||||