|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] tools/ocaml: Fix cleaning bindings test
make clean fails in the bindings tests:
make[7]: Entering directory '/home/amd/xen/tools/ocaml/tests/bindings'
rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.cmxs *.annot *.spot
*.spit unix.cmxa -ccopt -L -ccopt ....
rm: invalid option -- 'c'
Try 'rm --help' for more information.
Split the compiler flags out of the LIBS variable, since LIBS is passed
to rm. The individual *.cxma files are deleted in their respective
directories.
Fixes: d97847e858f1 ("tools/ocaml: Gitlab CI test for bindings")
Signed-off-by: Jason Andryuk <jason.andryuk@xxxxxxx>
---
tools/ocaml/tests/bindings/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/ocaml/tests/bindings/Makefile
b/tools/ocaml/tests/bindings/Makefile
index 75f8babbaf..98fcb7aa5b 100644
--- a/tools/ocaml/tests/bindings/Makefile
+++ b/tools/ocaml/tests/bindings/Makefile
@@ -10,8 +10,8 @@ OCAMLINCLUDE += \
-I $(OCAML_TOPLEVEL)/libs/xc \
-I $(OCAML_TOPLEVEL)/libs/eventchn
-LIBS = \
- unix.cmxa \
+LIBS = unix.cmxa
+LIBFLAGS = \
-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap
$(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \
-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn
$(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc
$(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
@@ -21,7 +21,7 @@ LIBS = \
PROGRAMS = test-ocaml-bindings
OCAML_PROGRAM = test-ocaml-bindings
-test-ocaml-bindings_LIBS = $(LIBS)
+test-ocaml-bindings_LIBS = $(LIBS) $(LIBFLAGS)
test-ocaml-bindings_MLSORTED = $(shell $(OCAMLDEP) -sort $(OBJS:=.ml))
test-ocaml-bindings_OBJS = $(test-ocaml-bindings_MLSORTED:.ml=)
--
2.34.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |