diff options
| author | Alasdair Armstrong | 2017-12-13 18:54:17 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-12-13 18:54:17 +0000 |
| commit | 2682a259a2a4a4ee34ddd6be6ea6f5dc3a3a15b7 (patch) | |
| tree | 8d8ac9d07cc824c2a6c887f345b2865802c4b8ff /src | |
| parent | b37a6de931c71a3d1136fee74885b5864c24c5c9 (diff) | |
| parent | 8dde03d441a322fc489e4d25e16cd75d02f64474 (diff) | |
Merge remote-tracking branch 'origin/master' into interactive
Diffstat (limited to 'src')
| -rw-r--r-- | src/LICENCE | 5 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/myocamlbuild.ml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/LICENCE b/src/LICENCE index 6b6dcc4f..c777e037 100644 --- a/src/LICENCE +++ b/src/LICENCE @@ -20,8 +20,9 @@ Copyright (c) 2013-2017 All rights reserved. This software was developed by the University of Cambridge Computer -Laboratory as part of the Rigorous Engineering of Mainstream Systems -(REMS) project, funded by EPSRC grant EP/K008528/1. +Laboratory and the University of Edinburgh as part of the Rigorous +Engineering of Mainstream Systems (REMS) project, funded by EPSRC +grant EP/K008528/1. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/src/Makefile b/src/Makefile index 34560a5a..aa7c0f95 100644 --- a/src/Makefile +++ b/src/Makefile @@ -91,7 +91,7 @@ SAIL_DIR:=$(realpath $(dir $(THIS_MAKEFILE))..) BITBUCKET_ROOT=$(realpath $(dir $(THIS_MAKEFILE))../..) LEM = $(BITBUCKET_ROOT)/lem/lem -LEMLIBOCAML = $(BITBUCKET_ROOT)/lem/ocaml-lib +LEMLIBOCAML = $(BITBUCKET_ROOT)/lem/ocaml-lib/_build_zarith ELFDIR= $(BITBUCKET_ROOT)/linksem ZARITH_DIR=$(LEMLIBOCAML)/dependencies/zarith ZARITH_LIB=$(ZARITH_DIR)/zarith.cma diff --git a/src/myocamlbuild.ml b/src/myocamlbuild.ml index 03257458..d912c965 100644 --- a/src/myocamlbuild.ml +++ b/src/myocamlbuild.ml @@ -69,7 +69,7 @@ let split ch s = let lem_dir = try Sys.getenv "LEM_DIR" (* LEM_DIR must contain an absolute path *) with Not_found -> "../../../lem" ;; -let lem_libdir = lem_dir / "ocaml-lib" ;; +let lem_libdir = lem_dir / "ocaml-lib" / "_build_zarith";; let lem_lib = lem_libdir / "extract" ;; let lem = lem_dir / "lem" ;; |