Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minor build system improvements.

  • Loading branch information...
commit ecb4a602a79cb4edabe3b41f44d6191eaaa8380c 1 parent c10b740
@pgj authored
View
3  packages/bsd.mirage.kmod.mk
@@ -3,7 +3,7 @@ KMOD?= mirage
# caml begins here
-CAMLP4= camlp4of -I +camlp4 ${LWTSYNTAX}
+CAMLP4= camlp4of -I +camlp4 ${LWTSYNTAX} ${CSTSYNTAX}
CAMLCC= ${OCAMLOPT} -nostdlib -I ${STDLIBDIR} -pp '${CAMLP4}'
MIRDIR!= ${OCAMLFIND} query mirage-platform
@@ -20,6 +20,7 @@ LWTSYNTAX= -I ${LWTDIR} lwt-syntax-options.cma lwt-syntax.cma
CSTDIR!= ${OCAMLFIND} query cstruct
CSTOBJS!= ls ${CSTDIR}/*.cmxa
CSTAS!= ls ${CSTDIR}/*.a
+CSTSYNTAX= -I ${CSTDIR} cstruct-syntax.cma
STLIBS= ${MIRAS} ${CSTAS} ${LWTAS}
View
2  packages/mirage-platform/_tags
@@ -1,3 +1,3 @@
-<lib/*>: for-pack(OS), use_syntax, use_custom_stdlib, use_lwt_syntax, use_cstruct
+<lib/*>: for-pack(OS), use_syntax, use_custom_stdlib, use_lwt, use_cstruct
<syntax/*>: build_syntax
true: camlp4of
View
8 packages/myocamlbuild.ml
@@ -30,9 +30,15 @@ dispatch begin function
(S[A "-nostdlib"; A "-I"; A (query "mirage-stdlib")]);
flag ["compile"; "use_cstruct"]
(S[A "-I"; A (query "cstruct")]);
- flag ["ocaml"; "pp"; "use_lwt_syntax"]
+ flag ["compile"; "use_lwt"]
+ (S[A "-I"; A (query "lwt")]);
+ flag ["compile"; "use_os"]
+ (S[A "-I"; A (query "mirage-platform")]);
+ flag ["ocaml"; "pp"; "use_lwt"]
(S[A "-I"; A (query "lwt"); A "lwt-syntax-options.cma"; A "lwt-syntax.cma"]);
flag ["ocaml"; "pp"; "use_cstruct"]
(S[A "-I"; A (query "cstruct"); A "cstruct-syntax.cma"]);
+ pflag ["ocaml"; "pack"] "for-repack"
+ (fun param -> S [A "-for-pack"; A param]);
| _ -> ()
end;;
Please sign in to comment.
Something went wrong with that request. Please try again.