diff options
author | Robert Norton <rmn30@cam.ac.uk> | 2019-09-04 17:28:22 +0100 |
---|---|---|
committer | Robert Norton <rmn30@cam.ac.uk> | 2019-09-04 17:28:22 +0100 |
commit | e918e17c081bc24bbf2ae213c211b9dabc276324 (patch) | |
tree | 7621be42dcb86adfaf59f4351498dc7325f6bed2 /Makefile | |
parent | 50033a227e89d679cd42b070e7e096586275357c (diff) | |
parent | 3d75de27c854072b82493a73e01c69d27624bf94 (diff) | |
download | sail-riscv-e918e17c081bc24bbf2ae213c211b9dabc276324.zip sail-riscv-e918e17c081bc24bbf2ae213c211b9dabc276324.tar.gz sail-riscv-e918e17c081bc24bbf2ae213c211b9dabc276324.tar.bz2 |
Merge remote-tracking branch 'origin/master' into vmem_ext.vmem_ext
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -79,7 +79,7 @@ PLATFORM_OCAML_SRCS = $(addprefix ocaml_emulator/,platform.ml platform_impl.ml r # Attempt to work with either sail from opam or built from repo in SAIL_DIR ifneq ($(SAIL_DIR),) # Use sail repo in SAIL_DIR -SAIL:=$(SAIL_DIR)/sail +SAIL:=$(SAIL_DIR)/sail -dno_cast export SAIL_DIR else # Use sail from opam package @@ -291,7 +291,7 @@ riscv_coq_build: generated_definitions/coq/$(ARCH)/riscv.vo $(addprefix generated_definitions/coq/$(ARCH)/,riscv.v riscv_types.v): $(SAIL_COQ_SRCS) Makefile mkdir -p generated_definitions/coq/$(ARCH) $(SAIL) $(SAIL_FLAGS) -dcoq_undef_axioms -coq -coq_output_dir generated_definitions/coq/$(ARCH) -o riscv -coq_lib riscv_extras $(SAIL_COQ_SRCS) -$(addprefix generated_definitions/coq/$(ARCH)/,riscv_duopod.v riscv_duopod_types.v): $(PRELUDE_SRCS) model/riscv_duopod.sail +$(addprefix generated_definitions/coq/$(ARCH)/,riscv_duopod.v riscv_duopod_types.v): $(PRELUDE_SRCS) model/riscv_duopod.sail model/riscv_termination_duo.sail mkdir -p generated_definitions/coq/$(ARCH) $(SAIL) $(SAIL_FLAGS) -dcoq_undef_axioms -coq -coq_output_dir generated_definitions/coq/$(ARCH) -o riscv_duopod -coq_lib riscv_extras $^ |