Skip to content

Commit 5a42fb4

Browse files
jtjeferreiratgodzik
authored andcommitted
improve javaBootClassPath lazy evaluation
[Cherry-picked 31690d4]
1 parent 7a1c473 commit 5a42fb4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: compiler/src/dotty/tools/dotc/config/PathResolver.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ object PathResolver {
5353
def classPathEnv: String = envOrElse("CLASSPATH", "")
5454
def sourcePathEnv: String = envOrElse("SOURCEPATH", "")
5555

56-
def javaBootClassPath: String = propOrElse("sun.boot.class.path", searchForBootClasspath)
56+
//using propOrNone/getOrElse instead of propOrElse so that searchForBootClasspath is lazy evaluated
57+
def javaBootClassPath: String = propOrNone("sun.boot.class.path") getOrElse searchForBootClasspath
5758

5859
def javaExtDirs: String = propOrEmpty("java.ext.dirs")
5960
def scalaHome: String = propOrEmpty("scala.home")

0 commit comments

Comments
 (0)