only apply JDK version check when launching C1Visualizer

rkennke · Oct 15, 2021 · b22011d · b22011d
1 parent 3f4eefd
commit b22011d
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
@@ -70,12 +70,6 @@ def run_netbeans_app(app_name, env=None, args=None):
         launch.append('-J-Dnetbeans.logger.console=false')
     mx.run(launch+args, env=env)
 
-def netbeans_jdk(appName):
-    v8u40 = mx.VersionSpec("1.8.0_40")
-    def _c1vJdkVersionCheck(version):
-        return version >= v8u40 and str(version).startswith('1.8.0')
-    return mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running " + appName).home
-
 def igv(args):
     """(obsolete) informs about IGV"""
     mx.warn(
@@ -88,8 +82,11 @@ def igv(args):
 
 def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
+    v8u40 = mx.VersionSpec("1.8.0_40")
+    def _c1vJdkVersionCheck(version):
+        return version >= v8u40 and str(version).startswith('1.8.0')
     env = dict(os.environ)
-    env['jdkhome'] = netbeans_jdk("C1 Visualizer")
+    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running C1 Visualizer").home
     run_netbeans_app('C1Visualizer', env, args() if callable(args) else args)
 
 def hsdis(args, copyToDir=None):