# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1341402952 -7200
# Node ID 99e186e7ad62f7d6b3994343786c3114d2a897f8
# Parent  30876d0bb92db2e8c4141f6182692dcb3d3984f6# Parent  12706c5b39bc4a5e69e7f4899092925ccc9ea45e
Merge

diff -r 12706c5b39bc -r 99e186e7ad62 mx/commands.py
--- a/mx/commands.py	Tue Jul 03 18:02:03 2012 +0200
+++ b/mx/commands.py	Wed Jul 04 13:55:52 2012 +0200
@@ -739,7 +739,7 @@
 
     parser = ArgumentParser(prog='mx gate');
     parser.add_argument('-j', '--omit-java-clean', action='store_false', dest='cleanJava', help='omit cleaning Java native code')
-    parser.add_argument('-n', '--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code')
+    parser.add_argument('-n', '--omit-native-clean', action='store_false', dest='cleanNative', 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')
     parser.add_argument('--jacocout', help='specify the output directory for jacoco report')
 
@@ -755,7 +755,7 @@
 
         t = Task('Clean')
         cleanArgs = []
-        if not args.buildNative:
+        if not args.cleanNative:
             cleanArgs.append('--no-native')
         if not args.cleanJava:
             cleanArgs.append('--no-java')
@@ -768,10 +768,9 @@
         for vmbuild in ['fastdebug', 'product']:
             _vmbuild = vmbuild
 
-            if args.buildNative:
-                t = Task('BuildHotSpotGraal:' + vmbuild)
-                buildvms(['--vms', 'graal', '--builds', vmbuild])
-                tasks.append(t.stop())
+            t = Task('BuildHotSpotGraal:' + vmbuild)
+            buildvms(['--vms', 'graal', '--builds', vmbuild])
+            tasks.append(t.stop())
 
             t = Task('BootstrapWithSystemAssertions:' + vmbuild)
             vm(['-esa', '-version'])
@@ -823,7 +822,7 @@
         tasks.append(t.stop())
 
         # Prevent Graal modifications from breaking the standard builds
-        if args.buildNative and args.buildNonGraal:
+        if args.buildNonGraal:
             t = Task('BuildHotSpotVarieties')
             buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product'])
             tasks.append(t.stop())