@@ -302,7 +302,8 @@ object Build {
302302 val dottyLib = jars(" dotty-library" )
303303 val dottyInterfaces = jars(" dotty-interfaces" )
304304 val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(File .pathSeparator)
305- dottyLib + File .pathSeparator + dottyInterfaces + File .pathSeparator + otherDeps
305+ val attList = (dependencyClasspath in Runtime ).value
306+ dottyLib + File .pathSeparator + findLib(attList, " scala-library-" )
306307 }
307308
308309 lazy val semanticdbSettings = Seq (
@@ -317,8 +318,7 @@ object Build {
317318 )
318319 )
319320
320- // Settings shared between dotty-doc and dotty-doc-bootstrapped
321- lazy val dottyDocSettings = Seq (
321+ def dottyDocSettings (implicit mode : Mode ) = Seq (
322322 baseDirectory in (Compile , run) := baseDirectory.value / " .." ,
323323 baseDirectory in Test := baseDirectory.value / " .." ,
324324
@@ -336,12 +336,10 @@ object Build {
336336 val majorVersion = baseVersion.take(baseVersion.lastIndexOf('.' ))
337337 IO .write(file(" ./docs/_site/versions/latest-nightly-base" ), majorVersion)
338338
339- val sources =
340- unmanagedSources.in(Compile , compile).value ++
341- unmanagedSources.in(`dotty-compiler`, Compile ).value ++
342- // TODO use bootstrapped library
343- // Blocked by #6295, also see https://github.com/lampepfl/dotty/pull/5499
344- unmanagedSources.in(`dotty-library`, Compile ).value
339+ val sources = unmanagedSources.in(mode match {
340+ case NonBootstrapped => `dotty-library`
341+ case Bootstrapped => `dotty-library-bootstrapped`
342+ }, Compile ).value
345343 val args = Seq (
346344 " -siteroot" , " docs" ,
347345 " -project" , " Dotty" ,
0 commit comments