wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix sbt assembly (remove duplicate classes, fix conflicts)

Browse Source
This commit is contained in:
abejgonzalez
2023-03-03 15:36:36 -08:00
parent 8c8820a678
commit fd62d9ec2d
7 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@@ -99,9 +99,11 @@ $(BOOTROM_TARGETS): $(build_dir)/bootrom.%.img: $(TESTCHIP_RSRCS_DIR)/testchipip
# compile scala jars
#########################################################################################
$(GEN_CLASSPATH_TARGETS) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS)
mkdir -p $(dir $@)
$(call run_sbt_assembly,$(SBT_PROJECT),$(GEN_CLASSPATH))
$(BTL_CLASSPATH_TARGETS) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS)
mkdir -p $(dir $@)
$(call run_sbt_assembly,tapeout,$(BTL_CLASSPATH))
#########################################################################################