Skip to content

Commit 0c97f76

Browse files
committed
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
1 parent ab0a83d commit 0c97f76

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

compiler/src/dotty/tools/dotc/config/JavaPlatform.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class JavaPlatform extends Platform {
1717
if (currentClassPath.isEmpty)
1818
currentClassPath = Some(new PathResolver().result)
1919
val cp = currentClassPath.get
20-
//println(cp)
21-
//println("------------------")
2220
cp
2321
}
2422

compiler/src/dotty/tools/dotc/config/PathResolver.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,7 @@ class PathResolver(implicit ctx: Context) {
255255
def containers = Calculated.containers
256256

257257
lazy val result: JavaClassPath = {
258-
// Prioritize `dotty.jar` and `dotty-lib.jar` to shadow others
259-
val (dottyJars, others) =
260-
containers.partition(x => x.name.contains("dotty-lib.jar") || x.name.contains("dotty.jar"))
261-
// Then any jars with `dotty` in the name - putting them before scala-library
262-
val (dottyCp, remaining) =
263-
others.partition(_.name.contains("dotty-"))
264-
265-
val cp = new JavaClassPath((dottyJars ++ dottyCp ++ remaining).toIndexedSeq, context)
258+
val cp = new JavaClassPath(containers.toIndexedSeq, context)
266259

267260
if (settings.Ylogcp.value) {
268261
Console.println("Classpath built from " + settings.toConciseString(ctx.sstate))

0 commit comments

Comments
 (0)