[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools/ocaml: simplify compile/link of test apps



commit b9fc6f36d54b5cbaad57e78e43a6763cbb802608
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Dec 3 11:22:00 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Dec 9 12:36:53 2015 +0000

    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 <ian.campbell@xxxxxxxxxx>
    Acked-by: David Scott <dave@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: David Scott <dave@xxxxxxxxxx>
---
 tools/ocaml/test/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
index b75726f..30a304b 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
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.