diff options
| author | Thomas Bauereiss | 2019-01-21 19:53:59 +0000 |
|---|---|---|
| committer | Thomas Bauereiss | 2019-01-21 20:07:20 +0000 |
| commit | aeb0f82f67ff829cd7a4b57c638b44a07d39ba3b (patch) | |
| tree | 291bb39f4fdfc79986af7b389a51a9f64c62e36d /test/isabelle | |
| parent | 2d2774282688e337866979b619640d4323adad50 (diff) | |
Don't require manual set up of Isabelle session directories
Since Isabelle 2018, specifying the same directory both on the command
line and persistently in the user's ROOTS file is allowed, so we don't
have to choose between one or the other any more.
Diffstat (limited to 'test/isabelle')
| -rw-r--r-- | test/isabelle/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/isabelle/Makefile b/test/isabelle/Makefile index 43028fed..5df82977 100644 --- a/test/isabelle/Makefile +++ b/test/isabelle/Makefile @@ -1,7 +1,8 @@ -CHERI_DIR = ../../cheri -AARCH64_DIR = ../../aarch64 +ISA_LIB_DIR = ../../lib/isabelle +CHERI_DIR ?= ../../../sail-cheri-mips/cheri +AARCH64_DIR ?= ../../aarch64 TGTS = run_cheri.native run_aarch64.native -SESSION_DIRS = -d $(CHERI_DIR) -d $(AARCH64_DIR) -d . +SESSION_DIRS = -d $(ISA_LIB_DIR) -d $(CHERI_DIR) -d $(AARCH64_DIR) -d . .PHONY: all clean |