File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -636,16 +636,21 @@ object Build {
636
636
else if (debugFromTasty) " dotty.tools.dotc.fromtasty.Debug"
637
637
else " dotty.tools.dotc.Main"
638
638
639
- var extraClasspath = s " $scalaLib${File .pathSeparator}$dottyLib"
640
- if ((decompile || printTasty) && ! args.contains(" -classpath" )) extraClasspath += s " ${File .pathSeparator}. "
639
+ var extraClasspath = Seq (scalaLib, dottyLib)
640
+
641
+ if ((decompile || printTasty) && ! args.contains(" -classpath" ))
642
+ extraClasspath ++= Seq (" ." )
643
+
641
644
if (args0.contains(" -with-compiler" )) {
642
645
if (scalaVersion.value == referenceVersion) {
643
646
log.error(" -with-compiler should only be used with a bootstrapped compiler" )
644
647
}
645
- extraClasspath += s " ${File .pathSeparator}$dottyCompiler"
648
+ val dottyInterfaces = jars(" dotty-interfaces" )
649
+ val asm = findLib(attList, " scala-asm" )
650
+ extraClasspath ++= Seq (dottyCompiler, dottyInterfaces, asm)
646
651
}
647
652
648
- val fullArgs = main :: insertClasspathInArgs(args, extraClasspath)
653
+ val fullArgs = main :: insertClasspathInArgs(args, extraClasspath.mkString( File .pathSeparator) )
649
654
650
655
(runMain in Compile ).toTask(fullArgs.mkString(" " , " " , " " ))
651
656
}
You can’t perform that action at this time.
0 commit comments