Mercurial > hg > truffle

changeset 14917:3e06a56ab0e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When building with JDT, use the one from JAVA_HOME but set the booclasspath, extdirs and endorseddirs to the correct JDK for cross-compilation.
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 15:50:55 +0200
parents 66e9855f4ae8
children 31a9c79399c8
files mxtool/mx.py
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Tue Apr 01 15:31:37 2014 +0200
+++ b/mxtool/mx.py	Tue Apr 01 15:50:55 2014 +0200
@@ -1890,14 +1890,14 @@
             else:
                 log('Compiling Java sources for {0} with JDT...'.format(p.name))
 
-                jdtArgs = [jdk.java, '-Xmx1g']
-                if jdk.debug_port is not None:
-                    jdtArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(jdk.debug_port)]
-
-                jdtArgs += ['-jar', jdtJar,
-                         '-' + compliance,
+                jdtVmArgs = ['-Xmx1g', '-jar', jdtJar]
+
+                jdtArgs = ['-' + compliance,
                          '-cp', cp, '-g', '-enableJavadoc',
-                         '-d', outputDir]
+                         '-d', outputDir,
+                         '-bootclasspath', jdk.bootclasspath(),
+                         '-endorseddirs', jdk.endorseddirs(),
+                         '-extdirs', jdk.extdirs()]
                 jdtArgs += processorArgs
 
 
@@ -1922,7 +1922,7 @@
                         jdtArgs += ['-properties', jdtProperties]
                 jdtArgs.append('@' + argfile.name)
 
-                run(jdtArgs)
+                run_java(jdtVmArgs + jdtArgs)
         finally:
             for n in toBeDeleted:
                 os.remove(n)