Revert 281831 "Fix nacl_integration to run 32bit tests with 32bi..."

trunk/src/build/detect_host_arch.py

Index: trunk/src/build/detect_host_arch.py
===================================================================
--- trunk/src/build/detect_host_arch.py	(revision 281998)
+++ trunk/src/build/detect_host_arch.py	(working copy)
@@ -10,8 +10,13 @@
 import sys
 
 
-def HostArch():
-  """Returns the host architecture with a predictable string."""
+def main():
+  print DoMain([])
+  return 0
+
+def DoMain(_):
+  """Hook to be called from gyp without starting a separate python
+  interpreter."""
   host_arch = platform.machine()
 
   # Convert machine type to format recognized by gyp.
@@ -31,10 +36,5 @@
 
   return host_arch
 
-def DoMain(_):
-  """Hook to be called from gyp without starting a separate python
-  interpreter."""
-  return HostArch()
-
 if __name__ == '__main__':
-  print DoMain([])
+  sys.exit(main())