From 630af4d319f6b8a2f633d463a2b549235569e6f0 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Mon, 20 May 2019 08:51:01 -0700
Subject: [PATCH] Fix detection of the JDK from a registry setting

---
 build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.ps1 b/build.ps1
index 75747822d1..dac40eb94a 100644
--- a/build.ps1
+++ b/build.ps1
@@ -331,7 +331,7 @@ if (($All -or $BuildJava) -and -not $NoBuildJava) {
         try {
             $jdkVersion = (Get-Item HKLM:\SOFTWARE\JavaSoft\JDK | Get-ItemProperty -name CurrentVersion).CurrentVersion
             $javaHome = (Get-Item HKLM:\SOFTWARE\JavaSoft\JDK\$jdkVersion | Get-ItemProperty -Name JavaHome).JavaHome
-            if (Test-Path "${env:JAVA_HOME}\bin\java.exe") {
+            if (Test-Path "$javaHome\bin\javac.exe") {
                 $env:JAVA_HOME = $javaHome
                 Write-Host -f Magenta "Detected JDK $jdkVersion in $env:JAVA_HOME (via registry)"
                 $foundJdk = $true