Mercurial > hg > truffle

comparison mx/commands.py @ 9168:50161aa21af2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deleted definition of TEST_IN_BUILD and GRAAL build variables as they are no longer used by the make files
author Doug Simon <doug.simon@oracle.com>
date Tue, 16 Apr 2013 22:46:02 +0200
parents e49300a46e88
children f0fc8329bf98
comparison
equal deleted inserted replaced
9167:e49300a46e88 9168:50161aa21af2
528 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.java().jdk + ')', 528 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.java().jdk + ')',
529 'ALT_OUTPUTDIR' : 'Build directory', 529 'ALT_OUTPUTDIR' : 'Build directory',
530 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(multiprocessing.cpu_count()) + ')', 530 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(multiprocessing.cpu_count()) + ')',
531 'INSTALL' : 'Install the built VM into the JDK? (default: y)', 531 'INSTALL' : 'Install the built VM into the JDK? (default: y)',
532 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)', 532 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)',
533 'TEST_IN_BUILD' : 'Run the Queens test as part of build (default: false)'
534 } 533 }
535 534
536 mx.log('HotSpot build variables that can be set by the -D option to "mx build":') 535 mx.log('HotSpot build variables that can be set by the -D option to "mx build":')
537 mx.log('') 536 mx.log('')
538 for n in sorted(buildVars.iterkeys()): 537 for n in sorted(buildVars.iterkeys()):
663 if vm.endswith('nograal'): 662 if vm.endswith('nograal'):
664 env['INCLUDE_GRAAL'] = 'false' 663 env['INCLUDE_GRAAL'] = 'false'
665 env.setdefault('ALT_OUTPUTDIR', join(_graal_home, 'build-nograal', mx.get_os())) 664 env.setdefault('ALT_OUTPUTDIR', join(_graal_home, 'build-nograal', mx.get_os()))
666 else: 665 else:
667 env['INCLUDE_GRAAL'] = 'true' 666 env['INCLUDE_GRAAL'] = 'true'
668 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD
669 env.setdefault('INSTALL', 'y') 667 env.setdefault('INSTALL', 'y')
670 if mx.get_os() == 'solaris' : 668 if mx.get_os() == 'solaris' :
671 # If using sparcWorks, setup flags to avoid make complaining about CC version 669 # If using sparcWorks, setup flags to avoid make complaining about CC version
672 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0] 670 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0]
673 if cCompilerVersion.startswith('CC: Sun C++') : 671 if cCompilerVersion.startswith('CC: Sun C++') :
679 # Some Makefile variable are overloaded by environment variable so we need to explicitely 677 # Some Makefile variable are overloaded by environment variable so we need to explicitely
680 # pass them down in the command line. This one is an example of that. 678 # pass them down in the command line. This one is an example of that.
681 runCmd.append('STRIP_POLICY=no_strip') 679 runCmd.append('STRIP_POLICY=no_strip')
682 # This removes the need to unzip the *.diz files before debugging in gdb 680 # This removes the need to unzip the *.diz files before debugging in gdb
683 env.setdefault('ZIP_DEBUGINFO_FILES', '0') 681 env.setdefault('ZIP_DEBUGINFO_FILES', '0')
684
685 # We don't need to run the Queens test (i.e. test_gamma)
686 env.setdefault('TEST_IN_BUILD', 'false')
687 682
688 # Clear these 2 variables as having them set can cause very confusing build problems 683 # Clear these 2 variables as having them set can cause very confusing build problems
689 env.pop('LD_LIBRARY_PATH', None) 684 env.pop('LD_LIBRARY_PATH', None)
690 env.pop('CLASSPATH', None) 685 env.pop('CLASSPATH', None)
691 686