summaryrefslogtreecommitdiff
path: root/build.sc
diff options
context:
space:
mode:
authorSequencer2020-04-04 17:10:48 +0000
committerGitHub2020-04-04 13:10:48 -0400
commitaa419c7190b42be1e7df78d5cb7c1ca4a8bc85b6 (patch)
treec9fe4101e15d6a8493fdb80aca3ad174b255cf1b /build.sc
parent86c1fa1879312ab1435b168e220239dd22a84eae (diff)
Fix mill build (#1399)
Fix bug introduced in #1384
Diffstat (limited to 'build.sc')
-rw-r--r--build.sc10
1 files changed, 5 insertions, 5 deletions
diff --git a/build.sc b/build.sc
index 959ccf88..b54c940c 100644
--- a/build.sc
+++ b/build.sc
@@ -18,7 +18,7 @@ def getVersion(dep: String, org: String = "edu.berkeley.cs") = {
ivy"$org::$dep:$version"
}
-// Since chisel contains submodule chiselFrontend and coreMacros, a CommonModule is needed
+// Since chisel contains submodule core and macros, a CommonModule is needed
trait CommonModule extends ScalaModule with SbtModule with PublishModule {
def firrtlModule: Option[PublishModule]
@@ -88,7 +88,7 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
def firrtlModule: Option[PublishModule] = None
- override def moduleDeps = super.moduleDeps ++ Seq(coreMacros, chiselFrontend) ++ firrtlModule
+ override def moduleDeps = super.moduleDeps ++ Seq(macros, core) ++ firrtlModule
object test extends Tests {
private def ivyCrossDeps = majorVersion match {
@@ -125,18 +125,18 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
Seq(generatedBuildInfo()._2)
}
- object coreMacros extends CommonModule {
+ object macros extends CommonModule {
def firrtlModule = m.firrtlModule
def crossVersion = crossVersionValue
}
- object chiselFrontend extends CommonModule {
+ object core extends CommonModule {
def firrtlModule = m.firrtlModule
def crossVersion = crossVersionValue
- def moduleDeps = super.moduleDeps ++ Seq(coreMacros) ++ firrtlModule
+ def moduleDeps = super.moduleDeps ++ Seq(macros) ++ firrtlModule
def scalacOptions = super.scalacOptions() ++ Seq(
"-deprecation",