Skip to content

Commit

Permalink
Update mill and rocket-chip (OpenXiangShan#810)
Browse files Browse the repository at this point in the history
  • Loading branch information
ljwljwljwljw authored May 12, 2021
1 parent 05f23f5 commit 16cf0dd
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.4
0.9.6
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ bump:
git submodule foreach "git fetch origin&&git checkout master&&git reset --hard origin/master"

bsp:
mill -i mill.contrib.BSP/install
mill -i mill.bsp.BSP/install

.PHONY: verilog sim-verilog emu clean help init bump bsp $(REF_SO)

2 changes: 1 addition & 1 deletion block-inclusivecache-sifive
14 changes: 0 additions & 14 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
import os.Path
import mill._
import mill.modules.Util
import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
import $ivy.`com.lihaoyi::mill-contrib-bsp:$MILL_VERSION`
import mill.contrib.buildinfo.BuildInfo
import scalalib._
import coursier.maven.MavenRepository

object CustomZincWorkerModule extends ZincWorkerModule {
def repositories() = super.repositories ++ Seq(
MavenRepository("https://maven.aliyun.com/repository/public"),
MavenRepository("https://maven.aliyun.com/repository/apache-snapshots")
)
}

trait CommonModule extends ScalaModule {
override def scalaVersion = "2.12.10"

override def scalacOptions = Seq("-Xsource:2.11")

override def zincWorker = CustomZincWorkerModule

private val macroParadise = ivy"org.scalamacros:::paradise:2.1.0"

override def compileIvyDeps = Agg(macroParadise)
Expand Down
2 changes: 1 addition & 1 deletion rocket-chip

0 comments on commit 16cf0dd

Please sign in to comment.