Mercurial > hg > graal-compiler
diff mx/commands.py @ 5764:66ec0bc36a37
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 04 Jul 2012 22:01:03 +0200 |
parents | b30cced39597 30876d0bb92d |
children | 613a3ddb9a71 |
line wrap: on
line diff
--- a/mx/commands.py Wed Jul 04 21:57:49 2012 +0200 +++ b/mx/commands.py Wed Jul 04 22:01:03 2012 +0200 @@ -708,7 +708,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') @@ -724,7 +724,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') @@ -737,10 +737,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']) @@ -792,7 +791,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())