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

Bump paradise plugin | Remove extra rm for SBT-server timestamp | Small bump for barstools

Browse Source
This commit is contained in:
abejgonzalez
2020-12-11 14:18:18 -08:00
parent 5c7c1295a1
commit 939e3a9f94
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@@ -13,7 +13,7 @@ lazy val commonSettings = Seq(
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
case _ => MergeStrategy.first}}, case _ => MergeStrategy.first}},
scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"), scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
unmanagedBase := (chipyardRoot / unmanagedBase).value, unmanagedBase := (chipyardRoot / unmanagedBase).value,
allDependencies := { allDependencies := {
// drop dependencies (org, name) // drop dependencies (org, name)

1
common.mk
View File

@@ -237,7 +237,6 @@ launch-sbt:
.PHONY: shutdown-sbt-server .PHONY: shutdown-sbt-server
shutdown-sbt-server: shutdown-sbt-server:
cd $(base_dir) && $(SBT) "shutdown" cd $(base_dir) && $(SBT) "shutdown"
rm -rf $(SBT_THIN_CLIENT_TIMESTAMP)
.PHONY: start-sbt-server .PHONY: start-sbt-server
start-sbt-server: start-sbt-server:

2
sims/firesim

Submodule sims/firesim updated: e43828a1fc...52a9d0fd2f

2
tools/barstools

Submodule tools/barstools updated: 15fa68b3a4...62f311654a