From 585c27774d71a083a9a209d45ff1fd8f6d9bbd9e Mon Sep 17 00:00:00 2001
From: Tomasz Gorochowik <tgorochowik@antmicro.com>
Date: Wed, 2 Feb 2022 09:03:25 +0100
Subject: [PATCH] Update moore build process for latest code

Signed-off-by: Tomasz Gorochowik <tgorochowik@antmicro.com>
---
 .github/workflows/sv-tests-ci.yml | 2 +-
 tools/runners.mk                  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml
index 1320b45abc338..cc53f74295251 100644
--- a/.github/workflows/sv-tests-ci.yml
+++ b/.github/workflows/sv-tests-ci.yml
@@ -17,7 +17,7 @@ jobs:
           - name: icarus
             deps: autoconf autotools-dev bison flex libfl-dev gperf
           - name: moore
-            deps: cargo
+            deps: cargo cmake
           - name: odin
             repo: odin_ii
             deps: autoconf autotools-dev bison flex libfl-dev cmake pkg-config
diff --git a/tools/runners.mk b/tools/runners.mk
index 22c6ec09e924d..2f4b04f3aeac3 100644
--- a/tools/runners.mk
+++ b/tools/runners.mk
@@ -132,7 +132,12 @@ $(INSTALL_DIR)/bin/parse_sv:
 moore: $(INSTALL_DIR)/bin/moore
 
 $(INSTALL_DIR)/bin/moore:
-	cargo install --path $(RDIR)/moore --root $(INSTALL_DIR) --bin moore
+	mkdir -p $(INSTALL_DIR)
+	(export CIRCT_SYS_CIRCT_DIR=$(RDIR)/circt && \
+		cd $(RDIR)/moore/ && \
+		./.github/build-llvm.sh && \
+		./.github/build-circt.sh && \
+		cargo install --path $(RDIR)/moore --root $(INSTALL_DIR) --bin moore)
 
 # verible
 verible: