aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Norton <rmn30@cam.ac.uk>2019-09-18 12:27:11 +0100
committerGitHub <noreply@github.com>2019-09-18 12:27:11 +0100
commit115d5c83e6c52b6e66cbc9db7e766092747dab0d (patch)
treeac16e2834b94ef9780f10269235f0b261bababa3
parentf6cd5e94b527f306b639dc9ec363880cf36b4e2b (diff)
parent2e433dd1003626b90a5c71695815d2a9daf93bfe (diff)
downloadsail-riscv-115d5c83e6c52b6e66cbc9db7e766092747dab0d.zip
sail-riscv-115d5c83e6c52b6e66cbc9db7e766092747dab0d.tar.gz
sail-riscv-115d5c83e6c52b6e66cbc9db7e766092747dab0d.tar.bz2
Merge pull request #19 from scottj97/upstream-2
Run Sail with -dno_cast even when it comes from opam package
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2c8981a..02257ac 100644
--- a/Makefile
+++ b/Makefile
@@ -76,10 +76,12 @@ SAIL_COQ_SRCS = $(addprefix model/,$(SAIL_ARCH_SRCS) $(SAIL_SEQ_INST_SRCS) $(SA
PLATFORM_OCAML_SRCS = $(addprefix ocaml_emulator/,platform.ml platform_impl.ml riscv_ocaml_sim.ml)
+SAIL_FLAGS += -dno_cast
+
# 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 -dno_cast
+SAIL:=$(SAIL_DIR)/sail
export SAIL_DIR
else
# Use sail from opam package