diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml index 25ad3882774ea..68ff13c948758 100644 --- 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 clang + 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 index 4f91804dfa6b4..0949c68e7c91b 160000 --- a/third_party/tools/moore +++ b/third_party/tools/moore @@ -1 +1 @@ -Subproject commit 4f91804dfa6b4ba22e3f26b891b1a504308578bd +Subproject commit 0949c68e7c91bae19ffa343aef777055b7dd6e6d diff --git a/tools/runners.mk b/tools/runners.mk index 29feb00b16660..6ebf482f64466 100644 --- 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: