# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1320875596 -3600
# Node ID 61f10abeb25af85ab5f593a729f868ca254441c2
# Parent  c773cc740d4af07177ec26f012670b27ded6c698
Removed more vestiges of JDK7G build support.

diff -r c773cc740d4a -r 61f10abeb25a pytools/commands.py
--- 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)
diff -r c773cc740d4a -r 61f10abeb25a pytools/gl.py
--- 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: