Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: tools/utils.py

Issue 3261003: Address some issues with detecting the architecture. See... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/utils.py
===================================================================
--- tools/utils.py (revision 5365)
+++ tools/utils.py (working copy)
@@ -63,14 +63,20 @@
return None
+# This will default to building the 32 bit VM even on machines that are capable
+# of running the 64 bit VM. Use the scons option --arch=x64 to force it to build
+# the 64 bit VM.
def GuessArchitecture():
id = platform.machine()
+ id = id.lower() # Windows 7 capitalizes 'AMD64'.
if id.startswith('arm'):
return 'arm'
- elif (not id) or (not re.match('(x|i[3-6])86', id) is None):
+ elif (not id) or (not re.match('(x|i[3-6])86$', id) is None):
return 'ia32'
elif id == 'i86pc':
return 'ia32'
+ elif id == 'x86_64':
+ return 'ia32'
elif id == 'amd64':
return 'ia32'
else:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698