# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1435591449 -7200
# Node ID 6b5221d7b5c1197ce67a2c74ed263515c5b747a3
# Parent  bb6e6bc3b7739eabaa1be05759e0b41b3a11dc4e
mx: Fix usage of JavaConfig caches while generating eclipse builders

diff -r bb6e6bc3b773 -r 6b5221d7b5c1 mxtool/mx.py
--- a/mxtool/mx.py	Sun Jun 28 15:10:30 2015 +0200
+++ b/mxtool/mx.py	Mon Jun 29 17:24:09 2015 +0200
@@ -4347,8 +4347,7 @@
     launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'})
     launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn})
     launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'})
-    launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : _default_java_home.jdk})
-    launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' :  os.pathsep.join([extraJavaHome.jdk for extraJavaHome in _extra_java_homes])})
+    launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : java().jdk})
     launchOut.close('mapAttribute')
 
     if refresh: