Merge pull request #3493 from chipsalliance/mergify/bp/master/pr-3489

Fix Makefrag for mill cross-compile (backport #3489)
chipsalliance · Sep 26, 2023 · 9428d83 · 9428d83
2 parents 6a6790a + a30a739
commit 9428d83
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Makefrag b/Makefrag
@@ -3,6 +3,8 @@ ifndef RISCV
 $(error Please set environment variable RISCV. Please take a look at README)
 endif
 
+CHISEL_VERSION=3.6.0
+
 MODEL ?= TestHarness
 PROJECT ?= freechips.rocketchip.system
 CFG_PROJECT ?= $(PROJECT)
@@ -44,7 +46,7 @@ all_srcs := $(scala_srcs) $(resources)
 
 ROCKET_CHIP_JAR := $(base_dir)/out/rocketchip/assembly.dest/out.jar
 $(ROCKET_CHIP_JAR): $(all_srcs)
-	cd $(base_dir) && $(MILL) rocketchip.assembly
+	cd $(base_dir) && $(MILL) rocketchip[$(CHISEL_VERSION)].assembly
 
 rc_resource_dir := $(base_dir)/src/main/resources
 csrc := $(rc_resource_dir)/csrc