From b9fc6f36d54b5cbaad57e78e43a6763cbb802608 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 3 Dec 2015 11:22:00 +0000 Subject: [PATCH] tools/ocaml: simplify compile/link of test apps xtl doesn't require the full LDLIBS_libxenctrl, just the -L and xenlight.cmxa, the latter which contains LDLIBS_libxenctrl as needed. Fixing this avoids the need to be concerned about LDLIBS_libxenctrl becoming more than one word in the future. Since the tests are pure ocaml (no C components) CFLAGS and LIBS_xenlight are not required. Signed-off-by: Ian Campbell Acked-by: David Scott Acked-by: Wei Liu Cc: David Scott --- tools/ocaml/test/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile index b75726fec3..30a304b6d1 100644 --- a/tools/ocaml/test/Makefile +++ b/tools/ocaml/test/Makefile @@ -2,9 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make -CFLAGS += $(CFLAGS_libxenlight) CFLAGS += $(APPEND_CFLAGS) -LIBS_xenlight = $(LDLIBS_libxenlight) OCAMLINCLUDE += \ -I $(OCAML_TOPLEVEL)/libs/xentoollog \ @@ -16,7 +14,7 @@ PROGRAMS = xtl send_debug_keys list_domains raise_exception dmesg xtl_LIBS = \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xentoollog $(OCAML_TOPLEVEL)/libs/xentoollog/xentoollog.cmxa \ - -cclib $(LDLIBS_libxenctrl) + -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xl $(OCAML_TOPLEVEL)/libs/xl/xenlight.cmxa xtl_OBJS = xtl -- 2.39.5