Skip to content
This repository has been archived by the owner on Oct 18, 2020. It is now read-only.

Commit

Permalink
add more 4.05 support, but disable by default as its still not working
Browse files Browse the repository at this point in the history
  • Loading branch information
avsm committed Jul 14, 2017
1 parent f3955d9 commit 6989696
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ script: bash -ex .travis-ci.sh
sudo: required
env:
- OCAML_VERSION=4.04
- OCAML_VERSION=4.05
2 changes: 1 addition & 1 deletion mirage-xen-ocaml.opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ depends: [
"ocaml-src"
"ocamlbuild" {build}
]
available: [ocaml-version >= "4.04.2" & ocaml-version <= "4.06.0" & os = "linux"]
available: [ocaml-version >= "4.04.2" & ocaml-version <= "4.05.0" & os = "linux"]
1 change: 1 addition & 0 deletions xen-ocaml/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ case `ocamlopt -version` in
echo Applying OCaml 4.05 config
cp config/version-405.h ocaml-src/byterun/caml/version.h
BIGARRAY_OBJ=""
CFLAGS="-D__ANDROID__"
;;
*)
echo unsupported OCaml version `ocamlopt -version`
Expand Down
16 changes: 11 additions & 5 deletions xen-ocaml/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,14 @@ fi

PUBLIC_INCLUDES="alloc.h callback.h config.h custom.h fail.h hash.h intext.h \
memory.h misc.h mlvalues.h printexc.h signals.h compatibility.h"
for i in ${PUBLIC_INCLUDES}; do
sed -f ../tools/cleanup-header $HEADERS_SRC/$i > $idir/caml/$i
done
cd ../otherlibs/bigarray
sed -f ../../tools/cleanup-header bigarray.h > $idir/caml/bigarray.h
if [ -e ../tools/cleanup-header ]; then
for i in ${PUBLIC_INCLUDES}; do
sed -f ../tools/cleanup-header $HEADERS_SRC/$i > $idir/caml/$i
done
cd ../otherlibs/bigarray
sed -f ../../tools/cleanup-header bigarray.h > $idir/caml/bigarray.h
else
for i in ${PUBLIC_INCLUDES} bigarray.h; do
cp ${HEADERS_SRC}/$i $idir/caml/$i
done
fi

0 comments on commit 6989696

Please sign in to comment.