diff options
| author | Brian Campbell | 2018-07-10 16:50:06 +0100 |
|---|---|---|
| committer | Brian Campbell | 2018-07-10 17:15:51 +0100 |
| commit | 497c8bf636619988203f8a868806fb04903db2dd (patch) | |
| tree | 58862858725c130c9e5e7c168d729ccde4f4e161 | |
| parent | 6bc52192841d712cb8d582841b0a73d2b7f59df6 (diff) | |
Make HOL build properly again for all of the models
| -rwxr-xr-x | aarch64/mono/demo/mk.hol | 2 | ||||
| -rw-r--r-- | cheri/Makefile | 2 | ||||
| -rw-r--r-- | mips/Makefile | 2 | ||||
| -rw-r--r-- | riscv/Makefile | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/aarch64/mono/demo/mk.hol b/aarch64/mono/demo/mk.hol index 3aa142a3..d55f2289 100755 --- a/aarch64/mono/demo/mk.hol +++ b/aarch64/mono/demo/mk.hol @@ -7,5 +7,5 @@ set -ex -lem -lem_mwords -lem_sequential -lem_lib Aarch64_extras -o aarch64_mono # Explicitly include replacement prompt files, as Lem's choice of file depends # on some internal dependency ordering -lem -hol -outdir . -lib ../../../lib/hol ../../../lib/hol/sail2_prompt_monad.lem ../../../lib/hol/sail2_prompt.lem -lib ../../../src/gen_lib/ -lib ../../../src/lem_interp ../aarch64_extras.lem aarch64_mono_types.lem aarch64_mono.lem +lem -hol -outdir . -lib ../../../lib/hol -i ../../../lib/hol/sail2_prompt_monad.lem -i ../../../lib/hol/sail2_prompt.lem -lib ../../../src/gen_lib/ -lib ../../../src/lem_interp ../aarch64_extras.lem aarch64_mono_types.lem aarch64_mono.lem Holmake diff --git a/cheri/Makefile b/cheri/Makefile index f3a0b7e7..0d207391 100644 --- a/cheri/Makefile +++ b/cheri/Makefile @@ -107,7 +107,7 @@ C%.thy: c%.lem c%_types.lem $(MIPS_SAIL_DIR)/mips_extras.lem sed -i 's/datatype ast/datatype (plugins only: size) ast/' C$*_types.thy %Script.sml: %.lem %_types.lem $(MIPS_SAIL_DIR)/mips_extras.lem - lem -hol -outdir . -lib $(SAIL_DIR)/lib/hol -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ + lem -hol -outdir . -lib $(SAIL_DIR)/lib/hol -i $(SAIL_DIR)/lib/hol/sail2_prompt_monad.lem -i $(SAIL_DIR)/lib/hol/sail2_prompt.lem -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ %Theory.uo: %Script.sml Holmake $@ diff --git a/mips/Makefile b/mips/Makefile index 062ccd8b..9fdda4d3 100644 --- a/mips/Makefile +++ b/mips/Makefile @@ -59,7 +59,7 @@ M%.thy: m%.lem m%_types.lem mips_extras.lem sed -i 's/datatype ast/datatype (plugins only: size) ast/' M$*_types.thy %Script.sml: %.lem %_types.lem $(MIPS_SAIL_DIR)/mips_extras.lem - lem -hol -outdir . -lib $(SAIL_DIR)/lib/hol -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ + lem -hol -outdir . -lib $(SAIL_DIR)/lib/hol -i $(SAIL_DIR)/lib/hol/sail2_prompt_monad.lem -i $(SAIL_DIR)/lib/hol/sail2_prompt.lem -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ %Theory.uo: %Script.sml Holmake $@ diff --git a/riscv/Makefile b/riscv/Makefile index 68272112..9633f0d4 100644 --- a/riscv/Makefile +++ b/riscv/Makefile @@ -62,7 +62,8 @@ riscv_sequential.lem: $(SAIL_SRCS) Makefile $(SAIL_DIR)/sail -lem -lem_sequential -o riscv_sequential -lem_mwords -lem_lib Riscv_extras_sequential $(SAIL_SRCS) riscvScript.sml : riscv.lem riscv_extras.lem - lem -hol -outdir . -lib ../lib/hol -lib ../src/lem_interp -lib ../src/gen_lib \ + lem -hol -outdir . -lib ../lib/hol -i ../lib/hol/sail2_prompt_monad.lem -i ../lib/hol/sail2_prompt.lem \ + -lib ../src/lem_interp -lib ../src/gen_lib \ riscv_extras.lem \ riscv_types.lem \ riscv.lem |