Mercurial > hg > truffle
changeset 3628:61f10abeb25a
Removed more vestiges of JDK7G build support.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 09 Nov 2011 22:53:16 +0100 |
| parents | c773cc740d4a |
| children | c7ddb0dea582 |
| files | pytools/commands.py pytools/gl.py |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pytools/commands.py Wed Nov 09 22:37:44 2011 +0100 +++ b/pytools/commands.py Wed Nov 09 22:53:16 2011 +0100 @@ -33,7 +33,7 @@ def clean(env, args): """cleans the GraalVM source tree""" os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16') - env.run(['gmake', 'clean'], cwd=join(env.graal_home, 'make')) + env.run([env.gmake_cmd(), 'clean'], cwd=join(env.graal_home, 'make')) def bootstrap(env, args): return env.run_vm(args + ['-version']) @@ -154,10 +154,7 @@ os.makedirs(graalVmDir) os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y') - env.run(['gmake', 'jvmggraal'], cwd=join(env.graal_home, 'make')) - - os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y') - env.run(['gmake', 'productgraal'], cwd=join(env.graal_home, 'make')) + env.run([env.gmake_cmd(), 'productgraal'], cwd=join(env.graal_home, 'make')) def vm(env, args): return env.run_vm(args)
--- a/pytools/gl.py Wed Nov 09 22:37:44 2011 +0100 +++ b/pytools/gl.py Wed Nov 09 22:53:16 2011 +0100 @@ -175,6 +175,15 @@ return retcode + def gmake_cmd(self): + for a in ['make', 'gmake', 'gnumake']: + try: + output = subprocess.check_output([a, '--version']) + if 'GNU' in output: + return a; + except: + pass + self.abort('Could not find a GNU make executable on the current path.') def log(self, msg=None): if msg is None: