Update moore build process for latest code

Signed-off-by: Tomasz Gorochowik <tgorochowik@antmicro.com>
chipsalliance · Feb 2, 2022 · 585c277 · 585c277
1 parent 878ffa7
commit 585c277
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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: