--- a/mx/commands.py	Fri Feb 17 14:47:57 2012 +0100
+++ b/mx/commands.py	Fri Feb 17 15:31:40 2012 +0100
@@ -624,7 +624,8 @@
             return self
              
     parser = ArgumentParser(prog='mx gate');
-    parser.add_argument('--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code')
+    parser.add_argument('-n', '--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code')
+    parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM')
 
     args = parser.parse_args(args)
 
@@ -656,7 +657,7 @@
         tasks.append(t.stop())
 
         # Prevent Graal modifications from breaking the standard builds
-        if args.buildNative:
+        if args.buildNative and args.buildNonGraal:
             t = Task('BuildHotSpotVarieties')
             buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product'])
             tasks.append(t.stop())