summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlasdair Armstrong2017-12-13 20:38:24 +0000
committerAlasdair Armstrong2017-12-13 21:07:18 +0000
commite636947dd964eb849cfeff528fe43a85fee7583a (patch)
treea5898231c62af9eaca02d7d6386feb6e48c7fe95 /lib
parent2682a259a2a4a4ee34ddd6be6ea6f5dc3a3a15b7 (diff)
Cleanup code by fixing compiler warnings, and fix ocaml compilation
Add the ast.sed script we need to build sail. Currently we just need this to fix up the locations in the AST but it will be removed once we can share locations between ocaml and lem.
Diffstat (limited to 'lib')
-rw-r--r--lib/ocaml_rts/Makefile1
-rw-r--r--lib/ocaml_rts/_tags3
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/ocaml_rts/Makefile b/lib/ocaml_rts/Makefile
index 3d837e25..52b8841b 100644
--- a/lib/ocaml_rts/Makefile
+++ b/lib/ocaml_rts/Makefile
@@ -50,7 +50,6 @@ all: main
import:
rsync -rv --include "*/" --include="*.ml" --include="*.mli" --exclude="*" $(BITBUCKET_ROOT)/linksem/src/ linksem
- rsync -rv --include "*/" --include="*.ml" --include="*.mli" --exclude="*" $(BITBUCKET_ROOT)/lem/ocaml-lib/ lem
main: import
ocamlbuild -pkg uint -pkg zarith main.native -use-ocamlfind
diff --git a/lib/ocaml_rts/_tags b/lib/ocaml_rts/_tags
index 5f2586c5..7d3f2d46 100644
--- a/lib/ocaml_rts/_tags
+++ b/lib/ocaml_rts/_tags
@@ -1,6 +1,5 @@
+true: use_lem
<main.{byte,native}>: use_nums, use_str, use_unix, debug
<linksem>: include
<linksem/adaptors>: include
-<lem>: include
-<lem/dependencies/zarith>: -traverse
<linksem/src_lem_library>: -traverse