# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1499432192 -7200
# Node ID c2e1176337787ef4dca0a96b45eae98cdf7834da
# Parent  e108f5565e05b77cdac7eebb4f5ef53d06f30c23
use openjdk prefix if bootstrap jdk is an openjdk

diff -r e108f5565e05 -r c2e117633778 hotspot/.project
--- a/hotspot/.project	Fri Jul 07 03:46:11 2017 -0700
+++ b/hotspot/.project	Fri Jul 07 14:56:32 2017 +0200
@@ -7,7 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers></triggers>
+			<triggers>auto,</triggers>
 			<arguments>
 				<dictionary>
 					<key>?children?</key>
diff -r e108f5565e05 -r c2e117633778 mx.jvmci/mx_jvmci.py
--- a/mx.jvmci/mx_jvmci.py	Fri Jul 07 03:46:11 2017 -0700
+++ b/mx.jvmci/mx_jvmci.py	Fri Jul 07 14:56:32 2017 +0200
@@ -465,7 +465,13 @@
     return join(vmLibDirInJdk(jdkDir), jvmCfgFile)
 
 def _jdksDir():
-    return os.path.abspath(join(_installed_jdks if _installed_jdks else _suite.dir, 'jdk' + str(get_jvmci_bootstrap_jdk().version)))
+    bootstrap_jdk = get_jvmci_bootstrap_jdk()
+    output = subprocess.check_output([bootstrap_jdk.java, '-version'], stderr=subprocess.STDOUT)
+    if 'openjdk' in output.lower():
+        prefix = 'openjdk'
+    else:
+        prefix = 'jdk'
+    return os.path.abspath(join(_installed_jdks if _installed_jdks else _suite.dir, prefix + str(bootstrap_jdk.version)))
 
 def _handle_missing_VM(bld, vm=None):
     if not vm: