Remove NACL_BUILD_ARCH_MAP

build/build_nexe.py

Index: build/build_nexe.py
diff --git a/build/build_nexe.py b/build/build_nexe.py
index 47e17f1b75623a3e55a5c0db3f42377c03d625a3..9f24bd23bea847fedbde75c6fc1d95a88461b6cd 100644
--- a/build/build_nexe.py
+++ b/build/build_nexe.py
@@ -31,20 +31,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import pynacl.platform
 
 
-# When a header file defining NACL_BUILD_SUBARCH is introduced,
-# we can simply remove this map.
-# cf) https://code.google.com/p/chromium/issues/detail?id=440012.
-NACL_BUILD_ARCH_MAP = {
-  'x86-32': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=32'],
-  'x86-32-nonsfi': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=32'],
-  'x86-64': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=64'],
-  'arm': ['NACL_BUILD_ARCH=arm', 'NACL_BUILD_SUBARCH=32'],
-  'arm-nonsfi': ['NACL_BUILD_ARCH=arm', 'NACL_BUILD_SUBARCH=32'],
-  'mips': ['NACL_BUILD_ARCH=mips', 'NACL_BUILD_SUBARCH=32'],
-  'pnacl': ['NACL_BUILD_ARCH=pnacl'],
-}
-
-
 def RemoveQuotes(opt):
   if opt and opt[0] == '"':
     assert opt[-1] == '"', opt
@@ -351,7 +337,8 @@ class Builder(CommandRunner):
                         'NACL_OSX=0',
                         'NACL_LINUX=0',
                         'NACL_ANDROID=0'])
-    define_list.extend(NACL_BUILD_ARCH_MAP[arch])
+    if arch == 'pnacl':
+      define_list.extend(['NACL_BUILD_ARCH=pnacl'])

[Nick Bray (chromium), 2015/03/31 00:25:23]

I assume the header doesn't clobber this when it's overridden.

Meta question: is this the officially support way to build for pnacl, or is
there a cleaner alternative?

     options += ['-D' + define for define in define_list]
     self.compile_options = options + ['-I' + name for name in self.inc_paths]