diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-12-02 09:31:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 09:31:04 +0100 |
| commit | ccfa36071f0623d64474f37b12d40a838aac1b4e (patch) | |
| tree | 741982f0327fd013d6f218b5582adea5d7d93fd4 /src/compiler/scala/tools/util/PathResolver.scala | |
| parent | aacef6d66e14096e36f849945800c092d4688f2a (diff) | |
| parent | 159480f2504cc08f9cc35660cc33090a49e0228e (diff) | |
| download | scala-ccfa36071f0623d64474f37b12d40a838aac1b4e.tar.gz scala-ccfa36071f0623d64474f37b12d40a838aac1b4e.tar.bz2 scala-ccfa36071f0623d64474f37b12d40a838aac1b4e.zip | |
Merge pull request #5385 from retronym/topic/JEP-220
Preliminary support for Java 9
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
| -rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index c351b6ace1..188cabbc8d 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -234,6 +234,7 @@ final class PathResolver(settings: Settings) { // Assemble the elements! def basis = List[Traversable[ClassPath]]( + JImageDirectoryLookup.apply(), // 0. The Java 9 classpath (backed by the jrt:/ virtual system) classesInPath(javaBootClassPath), // 1. The Java bootstrap class path. contentsOfDirsInPath(javaExtDirs), // 2. The Java extension class path. classesInExpandedPath(javaUserClassPath), // 3. The Java application class path. |