Skip to content

Commit

Permalink
Workaround issue with empty JAVA_HOME
Browse files Browse the repository at this point in the history
  • Loading branch information
alexarchambault committed Dec 10, 2021
1 parent 715f767 commit 970782f
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions modules/build/src/main/scala/scala/build/internal/OsLibc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,15 @@ object OsLibc {
else default
}

lazy val defaultJvm: String =
if (jvmIndexOs == "linux-musl") s"${JavaHome.systemId}|liberica" // zulu could work too
else JavaHome.defaultId
lazy val defaultJvm: String = {
val hasEmptyJavaHome = Option(System.getenv("JAVA_HOME")).exists(_.trim.isEmpty)
if (hasEmptyJavaHome)
// Not using the system JVM if JAVA_HOME is set to an empty string
// (workaround for https://github.com/coursier/coursier/issues/2292)
if (jvmIndexOs == "linux-musl") "liberica" // zulu could work too
else JavaHome.defaultJvm
else if (jvmIndexOs == "linux-musl") s"${JavaHome.systemId}|liberica" // zulu could work too
else s"${JavaHome.systemId}|${JavaHome.defaultJvm}"
}

}

0 comments on commit 970782f

Please sign in to comment.