comparison mx/commands.py @ 9939:e2068bbf4c0d

Merge.
author Doug Simon <doug.simon@oracle.com>
date Sat, 08 Jun 2013 00:25:49 +0200
parents 2a091d2987bd 0f7ca53be929
children 2194b25ff111
comparison
equal deleted inserted replaced
9938:63bae87147df 9939:e2068bbf4c0d
230 230
231 def _arch(): 231 def _arch():
232 machine = platform.uname()[4] 232 machine = platform.uname()[4]
233 if machine in ['amd64', 'AMD64', 'x86_64', 'i86pc']: 233 if machine in ['amd64', 'AMD64', 'x86_64', 'i86pc']:
234 return 'amd64' 234 return 'amd64'
235 if machine in ['sun4v']:
236 return 'sparc'
235 if machine == 'i386' and mx.get_os() == 'darwin': 237 if machine == 'i386' and mx.get_os() == 'darwin':
236 try: 238 try:
237 # Support for Snow Leopard and earlier version of MacOSX 239 # Support for Snow Leopard and earlier version of MacOSX
238 if subprocess.check_output(['sysctl', '-n', 'hw.cpu64bit_capable']).strip() == '1': 240 if subprocess.check_output(['sysctl', '-n', 'hw.cpu64bit_capable']).strip() == '1':
239 return 'amd64' 241 return 'amd64'