Bump moore

Signed-off-by: Tomasz Gorochowik <tgorochowik@antmicro.com>
chipsalliance · Jul 31, 2023 · 484acf7 · 484acf7
1 parent f57178b
commit 484acf7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml
@@ -18,6 +18,8 @@ jobs:
             deps: autoconf autotools-dev bison flex libfl-dev gperf
           - name: moore
             rust_ver: "1.60"
+            deps: cargo cmake
+            submodules: circt
           - name: odin
             repo: odin_ii
             deps: autoconf autotools-dev bison flex libfl-dev cmake pkg-config

diff --git a/third_party/tools/moore b/third_party/tools/moore
diff --git a/tools/runners.mk b/tools/runners.mk
@@ -111,7 +111,13 @@ $(INSTALL_DIR)/bin/parse_sv:
 moore: $(INSTALL_DIR)/bin/moore
 
 $(INSTALL_DIR)/bin/moore:
-	(export CARGO_NET_GIT_FETCH_WITH_CLI=true && 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 && \
+		export CARGO_NET_GIT_FETCH_WITH_CLI=true && \
+		cargo install --path $(RDIR)/moore --root $(INSTALL_DIR) --bin moore)
 
 # verible
 verible: