diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-11-27 15:24:22 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2017-01-27 13:54:28 +0100 |
| commit | 0c97f764fec6881abc812e0066cdebb3e0c6ce8a (patch) | |
| tree | d865572bd7a5bb688a69590558a24a1cf0a23818 | |
| parent | ab0a83d1456877c6a38f32b1d2a4529cbaa90a45 (diff) | |
| download | dotty-0c97f764fec6881abc812e0066cdebb3e0c6ce8a.tar.gz dotty-0c97f764fec6881abc812e0066cdebb3e0c6ce8a.tar.bz2 dotty-0c97f764fec6881abc812e0066cdebb3e0c6ce8a.zip | |
Remove hardcoded classpath reordering
If something needs to be fixed, fix it at the source. This prevented
dotty-compiler-bootstrapped from using the dotty-library-bootstrapped
clases instead of the dotty-library jar
| -rw-r--r-- | compiler/src/dotty/tools/dotc/config/JavaPlatform.scala | 2 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/config/PathResolver.scala | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala index b5bfbb39f..59201687a 100644 --- a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala +++ b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala @@ -17,8 +17,6 @@ class JavaPlatform extends Platform { if (currentClassPath.isEmpty) currentClassPath = Some(new PathResolver().result) val cp = currentClassPath.get - //println(cp) - //println("------------------") cp } diff --git a/compiler/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala index 8df9a8c0e..184b3718a 100644 --- a/compiler/src/dotty/tools/dotc/config/PathResolver.scala +++ b/compiler/src/dotty/tools/dotc/config/PathResolver.scala @@ -255,14 +255,7 @@ class PathResolver(implicit ctx: Context) { def containers = Calculated.containers lazy val result: JavaClassPath = { - // Prioritize `dotty.jar` and `dotty-lib.jar` to shadow others - val (dottyJars, others) = - containers.partition(x => x.name.contains("dotty-lib.jar") || x.name.contains("dotty.jar")) - // Then any jars with `dotty` in the name - putting them before scala-library - val (dottyCp, remaining) = - others.partition(_.name.contains("dotty-")) - - val cp = new JavaClassPath((dottyJars ++ dottyCp ++ remaining).toIndexedSeq, context) + val cp = new JavaClassPath(containers.toIndexedSeq, context) if (settings.Ylogcp.value) { Console.println("Classpath built from " + settings.toConciseString(ctx.sstate)) |