Merge pull request #76 from hannesm/minor

'cross-compilation' adjustments
mirage · Oct 29, 2018 · b2764d2 · b2764d2
2 parents ae4fc80 + 7e9c7b1
commit b2764d2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ env:
   - OCAML_VERSION=4.03
   - OCAML_VERSION=4.04
   - OCAML_VERSION=4.05
-  - OCAML_VERSION=4.05 EXTRA_DEPS="mirage-xen"
+  - OCAML_VERSION=4.05 DEPOPTS="mirage-xen-posix"
   - OCAML_VERSION=4.06
   - OCAML_VERSION=4.07
-  - OCAML_VERSION=4.07 EXTRA_DEPS="mirage-solo5"
+  - OCAML_VERSION=4.07 DEPOPTS="ocaml-freestanding"
diff --git a/digestif.opam b/digestif.opam
@@ -42,3 +42,12 @@ depends: [
   "fmt"            {with-test}
   "alcotest"       {with-test}
 ]
+
+depopts: [
+  "ocaml-freestanding"
+  "mirage-xen-posix"
+]
+
+conflicts: [
+  "ocaml-freestanding" {< "0.4.1"}
+]
diff --git a/src-c/native/freestanding/dune b/src-c/native/freestanding/dune
@@ -2,7 +2,7 @@
  (name        rakia_freestanding)
  (public_name digestif.rakia.freestanding)
  (optional)
- (libraries   mirage-solo5)
+ (libraries   ocaml-freestanding)
  (c_names     blake2b blake2s md5 ripemd160 sha1 sha256 sha512 misc stubs)
  (c_flags     (:include cflags.sexp)))
 

diff --git a/src-c/native/xen/dune b/src-c/native/xen/dune
@@ -2,7 +2,7 @@
  (name        rakia_xen)
  (public_name digestif.rakia.xen)
  (optional)
- (libraries   mirage-xen)
+ (libraries   mirage-xen-posix)
  (c_names     blake2b blake2s md5 ripemd160 sha1 sha256 sha512 misc stubs)
  (c_flags     (:include cflags.sexp)))