Skip to content

Commit 728f372

Browse files
committed
Ensure correct path to javac
1 parent 88cc5e0 commit 728f372

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/scala/com/sourcegraph/sbtsourcegraph/Versions.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,16 @@ object Versions {
7979
case Some(javaHome) =>
8080
val sb = new StringBuilder
8181
val proc = {
82+
val cmd =
83+
if (scala.util.Properties.isWin)
84+
Paths.get("bin", "javac.exe")
85+
else Paths.get("bin", "javac")
86+
8287
val stdout = scala.sys.process
83-
.Process(Seq("javac", "-version"), cwd = javaHome)
88+
.Process(Seq(cmd.toString(), "-version"), cwd = javaHome)
8489
.!!(ProcessLogger(sb.append(_)))
8590
.trim
91+
8692
// Java 8 sends output to stderr...
8793
if (stdout.isEmpty()) sb.result().trim else stdout
8894
}

0 commit comments

Comments
 (0)