From 5e56813d2d3cf8dc54850013c2f7dc41ec26d984 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Thu, 22 Oct 2015 14:05:19 +0200 Subject: Fix bug in dotc script. Used to always use bootstrapped version --- bin/dotc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dotc b/bin/dotc index aa8a9e44a..7b90b5220 100755 --- a/bin/dotc +++ b/bin/dotc @@ -192,7 +192,7 @@ trap onExit INT # If using the boot classpath, also pass an empty classpath # to java to suppress "." from materializing. classpathArgs () { - if [[ -n $bootstrapped ]]; then + if [[ "true" == $bootstrapped ]]; then checkjar $DOTTY_JAR "test:runMain dotc.build" src toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR" else -- cgit v1.2.3 From 1f9131273dc0ac9811532a35349c6bd58711eb7e Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Fri, 23 Oct 2015 10:38:38 +0200 Subject: Indicate that dotty is being built. --- test/dotc/build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotc/build.scala b/test/dotc/build.scala index cb5f7ab95..9f47796c3 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -19,6 +19,7 @@ object build extends tests { } def main(args: Array[String]): Unit = { + println("------------ Building dotty ------------") deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) -- cgit v1.2.3