diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 20:28:37 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 20:28:37 -0400 |
| commit | 1694dd3bc3cd407c3784080d38778030385ae758 (patch) | |
| tree | 9fddfe60e03ad0ea58df8de0b8a07af3c4169f0c /stage2/plugins/Dotty.scala | |
| parent | fc29c605ab5c7fcb671495789698e93482d3a8e5 (diff) | |
| download | cbt-1694dd3bc3cd407c3784080d38778030385ae758.tar.gz cbt-1694dd3bc3cd407c3784080d38778030385ae758.tar.bz2 cbt-1694dd3bc3cd407c3784080d38778030385ae758.zip | |
minor Dotty plugin cleanup
Diffstat (limited to 'stage2/plugins/Dotty.scala')
| -rw-r--r-- | stage2/plugins/Dotty.scala | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/stage2/plugins/Dotty.scala b/stage2/plugins/Dotty.scala index 5fdf066..c6acbcd 100644 --- a/stage2/plugins/Dotty.scala +++ b/stage2/plugins/Dotty.scala @@ -107,10 +107,6 @@ class DottyLib( None }else{ if( needsRecompile ){ - val dotty = dottyDependency - - val cp = classpath ++ dotty.classpath - val start = System.currentTimeMillis val _class = "dotty.tools.dotc.Main" @@ -128,9 +124,10 @@ class DottyLib( lib.runMain( _class, dualArgs ++ singleArgs ++ Seq( - "-classpath", cp.string // let's put cp last. It so long + "-bootclasspath", dottyDependency.classpath.string, // let's put cp last. It so long + "-classpath", classpath.string // let's put cp last. It so long ) ++ files.map(_.toString), - dotty.classLoader(classLoaderCache) + dottyDependency.classLoader(classLoaderCache) ) } } catch { @@ -138,7 +135,7 @@ class DottyLib( System.err.println(red("Dotty crashed. See https://github.com/lampepfl/dotty/issues. To reproduce run:")) System.out.println(s""" java -cp \\ -${dotty.classpath.strings.mkString(":\\\n")} \\ +${dottyDependency.classpath.strings.mkString(":\\\n")} \\ \\ ${_class} \\ \\ @@ -146,8 +143,10 @@ ${dualArgs.grouped(2).map(_.mkString(" ")).mkString(" \\\n")} \\ \\ ${singleArgs.mkString(" \\\n")} \\ \\ +-bootclasspath \\ +${dottyDependency.classpath.strings.mkString(":\\\n")} \\ -classpath \\ -${cp.strings.mkString(":\\\n")} \\ +${classpath.strings.mkString(":\\\n")} \\ \\ ${files.sorted.mkString(" \\\n")} """ |