Mercurial > hg > truffle

comparison mx/commands.py @ 9166:0f3fe35513a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed build variable used to make a Graal/non-Graal build from OMIT_GRAAL to INCLUDE_GRAAL and ensured it is only used internally
author Doug Simon <doug.simon@oracle.com>
date Tue, 16 Apr 2013 22:26:28 +0200
parents 45b37dcb24de
children e49300a46e88
comparison
equal deleted inserted replaced
9165:0735e848762a 9166:0f3fe35513a0
700 env.setdefault('ALT_BOOTDIR', mx.java().jdk) 700 env.setdefault('ALT_BOOTDIR', mx.java().jdk)
701 if not mx._opts.verbose: 701 if not mx._opts.verbose:
702 runCmd.append('MAKE_VERBOSE=') 702 runCmd.append('MAKE_VERBOSE=')
703 env['JAVA_HOME'] = jdk 703 env['JAVA_HOME'] = jdk
704 if vm.endswith('nograal'): 704 if vm.endswith('nograal'):
705 env['OMIT_GRAAL'] = 'true' 705 env['INCLUDE_GRAAL'] = 'false'
706 env.setdefault('ALT_OUTPUTDIR', join(_graal_home, 'build-nograal', mx.get_os())) 706 env.setdefault('ALT_OUTPUTDIR', join(_graal_home, 'build-nograal', mx.get_os()))
707 else: 707 else:
708 env['INCLUDE_GRAAL'] = 'true'
708 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD 709 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD
709 env.setdefault('INSTALL', 'y') 710 env.setdefault('INSTALL', 'y')
710 if mx.get_os() == 'solaris' : 711 if mx.get_os() == 'solaris' :
711 # If using sparcWorks, setup flags to avoid make complaining about CC version 712 # If using sparcWorks, setup flags to avoid make complaining about CC version
712 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0] 713 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0]