replica
/
firesim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[make] Add Scala build tool deps to target elaboration recipes

This commit is contained in:
David Biancolin 2020-06-26 22:50:13 -07:00
parent c44657aa0a
commit 03e82779f7
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sim/Makefile
View File

@ -68,7 +68,8 @@ endif
#########################
# Bloop Project Defs #
#########################
$(BLOOP_CONFIG_DIR)/TIMESTAMP: build.sbt
sbt_sources = $(shell find -L $(base_dir) -name target -prune -o -iname "*.sbt" -print 2> /dev/null)
$(BLOOP_CONFIG_DIR)/TIMESTAMP: $(sbt_sources)
cd $(base_dir) && $(SBT) "project $(firesim_sbt_project)" "bloopInstall"
touch $@

2
sim/src/main/makefrag/fasedtests/Makefrag
View File

@ -38,7 +38,7 @@ chisel_src_dirs = \
chisel_srcs = $(foreach submodule,$(chisel_src_dirs),\
$(shell find $(submodule)/ -iname "[!.]*.scala" -print 2> /dev/null | grep 'src/main/scala'))
$(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR)
$(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR) $(SCALA_BUILDTOOL_DEPS)
mkdir -p $(@D)
$(call run_scala_main,$(firesim_sbt_project),chipyard.Generator, \
--target-dir $(GENERATED_DIR) \

2
sim/src/main/makefrag/firesim/Makefrag
View File

@ -39,7 +39,7 @@ else
firesim_sbt_project := firechip
endif
$(FIRRTL_FILE) $(ANNO_FILE): $(SCALA_SOURCES) $(FIRRTL_JAR)
$(FIRRTL_FILE) $(ANNO_FILE): $(SCALA_SOURCES) $(FIRRTL_JAR) $(SCALA_BUILDTOOL_DEPS)
mkdir -p $(@D)
$(call run_scala_main,$(firesim_sbt_project),chipyard.Generator,\
--target-dir $(GENERATED_DIR) \

2
sim/src/main/makefrag/midasexamples/Makefrag
View File

@ -44,7 +44,7 @@ mem_model_args = $(shell cat $(SIM_RUNTIME_CONF))
COMMON_SIM_ARGS ?= $(mem_model_args)
vcs_args = +vcs+initreg+0 +vcs+initmem+0
$(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR)
$(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR) $(SCALA_BUILDTOOL_DEPS)
mkdir -p $(@D)
$(call run_scala_main,$(firesim_sbt_project),chipyard.Generator, \
--target-dir $(GENERATED_DIR) \