# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1395937880 -3600
# Node ID 0d158f22f14cc3e907e72b4b250832db43e185d2
# Parent  3a855006bf288c18cee375f2079b95669ecddb70# Parent  66ac13a2c7a1c8e5af65a45aeb7e8c3a64a14371
Merge.

diff -r 3a855006bf28 -r 0d158f22f14c mxtool/mx.py
--- a/mxtool/mx.py	Thu Mar 27 16:23:22 2014 +0100
+++ b/mxtool/mx.py	Thu Mar 27 17:31:20 2014 +0100
@@ -3016,6 +3016,7 @@
     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' : java(p.javaCompliance).jdk})
+    launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : _opts.extra_java_homes})
     launchOut.close('mapAttribute')
 
     if refresh: