Mercurial > hg > truffle
comparison mx/commands.py @ 8884:51a8368d0231
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 |
comparison
equal
deleted
inserted
replaced
8883:b9a918201d47 | 8884:51a8368d0231 |
---|---|
616 cpus = multiprocessing.cpu_count() | 616 cpus = multiprocessing.cpu_count() |
617 runCmd = [mx.gmake_cmd()] | 617 runCmd = [mx.gmake_cmd()] |
618 if build == 'debug': | 618 if build == 'debug': |
619 build = 'jvmg' | 619 build = 'jvmg' |
620 runCmd.append(build + buildSuffix) | 620 runCmd.append(build + buildSuffix) |
621 env = os.environ | 621 env = os.environ.copy() |
622 env.setdefault('ARCH_DATA_MODEL', '64') | 622 env.setdefault('ARCH_DATA_MODEL', '64') |
623 env.setdefault('LANG', 'C') | 623 env.setdefault('LANG', 'C') |
624 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) | 624 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) |
625 env['ALT_BOOTDIR'] = jdk | 625 env['ALT_BOOTDIR'] = mx.java().jdk |
626 env['JAVA_HOME'] = jdk | |
626 if not env.has_key('OMIT_GRAAL'): | 627 if not env.has_key('OMIT_GRAAL'): |
627 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD | 628 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD |
628 env.setdefault('INSTALL', 'y') | 629 env.setdefault('INSTALL', 'y') |
629 if mx.get_os() == 'solaris' : | 630 if mx.get_os() == 'solaris' : |
630 # If using sparcWorks, setup flags to avoid make complaining about CC version | 631 # If using sparcWorks, setup flags to avoid make complaining about CC version |
646 | 647 |
647 # Clear these 2 variables as having them set can cause very confusing build problems | 648 # Clear these 2 variables as having them set can cause very confusing build problems |
648 env.pop('LD_LIBRARY_PATH', None) | 649 env.pop('LD_LIBRARY_PATH', None) |
649 env.pop('CLASSPATH', None) | 650 env.pop('CLASSPATH', None) |
650 | 651 |
651 mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage) | 652 mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage, env=env) |
652 | 653 |
653 jvmCfg = _vmCfgInJdk(jdk) | 654 jvmCfg = _vmCfgInJdk(jdk) |
654 found = False | 655 found = False |
655 if not exists(jvmCfg): | 656 if not exists(jvmCfg): |
656 mx.abort(jvmCfg + ' does not exist') | 657 mx.abort(jvmCfg + ' does not exist') |