From aeb0f82f67ff829cd7a4b57c638b44a07d39ba3b Mon Sep 17 00:00:00 2001
From: Thomas Bauereiss
Date: Mon, 21 Jan 2019 19:53:59 +0000
Subject: 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.
---
 test/isabelle/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'test')

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
 
-- 
cgit v1.2.3