Skip to content

Commit

Permalink
Merge pull request #22 from hannesm/xen
Browse files Browse the repository at this point in the history
Xen
  • Loading branch information
johnelse committed Apr 14, 2016
2 parents 15b282e + a1a9e54 commit 4efa8e5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 42 deletions.
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ License: ISC
Copyrights: (C) 2013 John Else
BuildTools: ocamlbuild
Plugins: META (0.3)
PostConfCommand: ocaml postconf.ml
PostConfCommand: ./postconf.sh

Flag xen
Description: Build Xen support
Expand Down
37 changes: 0 additions & 37 deletions postconf.ml

This file was deleted.

9 changes: 9 additions & 0 deletions postconf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

export PKG_CONFIG_PATH="$(opam config var prefix)/lib/pkgconfig"

# Bridge through $XEN_CFLAGS from the environment into Oasis' world.
#
XEN_CFLAGS="disabled"
grep -q '^xen="true"' setup.data && XEN_CFLAGS="$(pkg-config --static mirage-xen --cflags)"
echo "XEN_CFLAGS=\"${XEN_CFLAGS}\"" >> setup.data
9 changes: 5 additions & 4 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 4be2b6bdca43b82e6a3b306200f2d749) *)
(* DO NOT EDIT (digest: b474f80222837eed4f520618af75b23a) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6884,7 +6884,7 @@ let setup_t =
{
pre_command = [(OASISExpr.EBool true, None)];
post_command =
[(OASISExpr.EBool true, Some (("ocaml", ["postconf.ml"])))]
[(OASISExpr.EBool true, Some (("./postconf.sh", [])))]
};
build_type = (`Build, "ocamlbuild", Some "0.4");
build_custom =
Expand Down Expand Up @@ -7082,14 +7082,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "[:Y;\029\161\163\201|\229E\156\007Fm\127";
oasis_digest =
Some "\186#\218\238\196\203\138|\255_\220\138\171Y\205\029";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7094 "setup.ml"
# 7095 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 4efa8e5

Please sign in to comment.