comparison mx/mx_graal.py @ 17392:9c241dc74cfc

mx: specify jar of classes differently depending on whether Graal is hosted or not
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Oct 2014 15:51:34 +0200
parents 9e5abd0e7916
children 6d82c240d83e
comparison
equal deleted inserted replaced
17388:9e5abd0e7916 17392:9c241dc74cfc
1368 1368
1369 if args.ctwopts: 1369 if args.ctwopts:
1370 vmargs.append('-G:CompileTheWorldConfig=' + args.ctwopts) 1370 vmargs.append('-G:CompileTheWorldConfig=' + args.ctwopts)
1371 1371
1372 if args.jar: 1372 if args.jar:
1373 jar = args.jar 1373 jar = os.path.abspath(args.jar)
1374 else: 1374 else:
1375 jar = join(_jdk(installJars=False), 'jre', 'lib', 'rt.jar') 1375 jar = join(_jdk(installJars=False), 'jre', 'lib', 'rt.jar')
1376 1376
1377 vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + jar] 1377 vmargs += ['-XX:+CompileTheWorld']
1378 if _get_vm() == 'graal': 1378 if _get_vm() == 'graal':
1379 vmargs += ['-XX:+BootstrapGraal'] 1379 vmargs += ['-XX:+BootstrapGraal', '-G:CompileTheWorldClasspath=' + jar]
1380 else:
1381 vmargs += ['-Xbootclasspath/p:' + jar]
1380 vm(vmargs) 1382 vm(vmargs)
1381 1383
1382 def _basic_gate_body(args, tasks): 1384 def _basic_gate_body(args, tasks):
1383 t = Task('BuildHotSpotGraal: fastdebug,product') 1385 t = Task('BuildHotSpotGraal: fastdebug,product')
1384 buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product']) 1386 buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])