From 6fbb57d3e2765b5235692ac2c24b53cf48cd82b6 Mon Sep 17 00:00:00 2001
From: Shaked Flur
Date: Sat, 19 Jan 2019 10:15:42 +0000
Subject: wib

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 12684d91..18b18bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -73,4 +73,4 @@ clean:
 	for subdir in src arm ; do\
 	  $(MAKE) -C "$$subdir" clean;\
 	done
-	-rm sail
+	rm -f sail
-- 
cgit v1.2.3


From a1bb96154e800796250af39f598ed39823fa0de0 Mon Sep 17 00:00:00 2001
From: Robert Norton
Date: Tue, 22 Jan 2019 15:43:52 +0000
Subject: Build isabelle and hol files in lib from lem before opam install.

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 18b18bfd..e42b0dba 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ install:
 	mkdir -p $(INSTALL_DIR)/bin
 	cp src/isail.native $(INSTALL_DIR)/bin/sail
 	mkdir -p $(SHARE_DIR)
+	make -C lib/isabelle all
+	make -C lib/hol all-scripts
 	cp -r lib $(SHARE_DIR)
 	mkdir -p $(SHARE_DIR)/src
 	cp src/elf_loader.ml $(SHARE_DIR)/src
@@ -40,9 +42,6 @@ archs:
 	  $(MAKE) -C "$$arch" || exit;\
 	done
 
-isabelle-lib:
-	$(MAKE) -C isabelle-lib
-
 apply_header:
 	$(MAKE) clean
 	headache -c etc/headache_config -h etc/mips_header `ls mips/*.sail`
-- 
cgit v1.2.3