Skip to content

Commit fea851a

Browse files
authored
Extract java home from env variable (#1084)
1 parent 866c78b commit fea851a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

modules/options/src/main/scala/scala/build/options/BuildOptions.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,12 @@ final case class BuildOptions(
183183
javaOptions.javaHomeOpt
184184
.orElse {
185185
if (javaOptions.jvmIdOpt.isEmpty)
186-
sys.props.get("java.home").map(p =>
187-
Positioned(Position.Custom("java.home prop"), os.Path(p, Os.pwd))
186+
Option(System.getenv("JAVA_HOME")).map(p =>
187+
Positioned(Position.Custom("JAVA_HOME env"), os.Path(p, Os.pwd))
188+
).orElse(
189+
sys.props.get("java.home").map(p =>
190+
Positioned(Position.Custom("java.home prop"), os.Path(p, Os.pwd))
191+
)
188192
)
189193
else None
190194
}

0 commit comments

Comments
 (0)