Build.scala: fix usage of -sourcepath

smarter · smarter · commit 44a598b063fd · 2019-12-19T17:38:58.000+01:00
Previously it was missing some source directories (in particular,
src-bootstrapped and src-non-bootstrapped).
diff --git a/project/Build.scala b/project/Build.scala
@@ -753,7 +753,7 @@ object Build {
   // Settings shared between dotty-library and dotty-library-bootstrapped
   lazy val dottyLibrarySettings = Seq(
     // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
-    scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath),
+    scalacOptions in Compile ++= Seq("-sourcepath", (sourceDirectories in Compile).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator)),
   )
 
   lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ object Build {`
`753`	`753`	`// Settings shared between dotty-library and dotty-library-bootstrapped`
`754`	`754`	`lazy val dottyLibrarySettings = Seq(`
`755`	`755`	// Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
`756`		`- scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath),`
	`756`	`+ scalacOptions in Compile ++= Seq("-sourcepath", (sourceDirectories in Compile).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator)),`
`757`	`757`	`)`
`758`	`758`
`759`	`759`	lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)