Mercurial > hg > truffle

diff mx/commands.py @ 8884:51a8368d0231

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapt to changes in hotspot makefiles : pass our JAVA_HOME as ALT_BOOTDIR (so that things are built with a 'safe' jdk) and our jdk copy as JAVA_HOME (so that the jvm gets installed there)
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sun, 07 Apr 2013 13:30:37 +0200
parents 5f8299106dd9
children 4877c7dfe6d6
line wrap: on
line diff
--- a/mx/commands.py	Sat Apr 06 20:04:06 2013 +0200
+++ b/mx/commands.py	Sun Apr 07 13:30:37 2013 +0200
@@ -618,11 +618,12 @@
             if build == 'debug':
                 build = 'jvmg'
             runCmd.append(build + buildSuffix) 
-            env = os.environ
+            env = os.environ.copy()
             env.setdefault('ARCH_DATA_MODEL', '64')
             env.setdefault('LANG', 'C')
             env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus))
-            env['ALT_BOOTDIR'] = jdk
+            env['ALT_BOOTDIR'] = mx.java().jdk
+            env['JAVA_HOME'] = jdk
             if not env.has_key('OMIT_GRAAL'):
                 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD
             env.setdefault('INSTALL', 'y')
@@ -648,7 +649,7 @@
             env.pop('LD_LIBRARY_PATH', None)
             env.pop('CLASSPATH', None)
 
-            mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage)
+            mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage, env=env)
 
         jvmCfg = _vmCfgInJdk(jdk)
         found = False