From 2bb0bc45b6aa4f02b4e88d14a82baa64747cd483 Mon Sep 17 00:00:00 2001
From: Brian Campbell
Date: Fri, 1 Feb 2019 11:57:18 +0000
Subject: Make hol libraries use opam Lem library by default

---
 lib/hol/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/hol/Makefile')

diff --git a/lib/hol/Makefile b/lib/hol/Makefile
index 783ef23d..204328d4 100644
--- a/lib/hol/Makefile
+++ b/lib/hol/Makefile
@@ -1,3 +1,5 @@
+LEM_DIR?=$(shell opam config var lem:share)/hol-lib
+
 LEMSRC =  \
   ../../src/lem_interp/sail2_instr_kinds.lem \
   ../../src/gen_lib/sail2_values.lem \
@@ -25,7 +27,7 @@ $(SCRIPTS): $(LEMSRC)
 	lem -hol -outdir . -auxiliary_level none -lib ../../src/lem_interp -lib ../../src/gen_lib $(LEMSRC)
 
 $(THYS) sail-heap: $(SCRIPTS)
-	Holmake
+	LEM_DIR=$(LEM_DIR) Holmake
 
 # Holmake will also clear out the generated $(SCRIPTS) files
 clean:
-- 
cgit v1.2.3


From 8fa50e9e2fc4752e9c7e14b59ad0c749f56914b4 Mon Sep 17 00:00:00 2001
From: Brian Campbell
Date: Fri, 1 Feb 2019 14:28:30 +0000
Subject: Tweak HOL LEM_DIR to match riscv makefile

---
 lib/hol/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/hol/Makefile')

diff --git a/lib/hol/Makefile b/lib/hol/Makefile
index 204328d4..c863a05b 100644
--- a/lib/hol/Makefile
+++ b/lib/hol/Makefile
@@ -1,4 +1,4 @@
-LEM_DIR?=$(shell opam config var lem:share)/hol-lib
+LEM_DIR?=$(shell opam config var lem:share)
 
 LEMSRC =  \
   ../../src/lem_interp/sail2_instr_kinds.lem \
-- 
cgit v1.2.3