[NaCl SDK] Fix the AppEngine lua build after r243629.

native_client_sdk/src/tools/nacl_config.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A helper script to print paths of NaCl binaries, includes, libs, etc.
 
 It is similar in behavior to pkg-config or sdl-config.
 """
 
 import optparse
 import os
 import posixpath
 import sys
 
 import getos
 
 
 if sys.version_info < (2, 6, 0):
   sys.stderr.write("python 2.6 or later is required run this script\n")
   sys.exit(1)
 
 
 VALID_ARCHES = ('arm', 'x86_32', 'x86_64', 'i686')
+VALID_PNACL_ARCHES = (None, 'pnacl')
 ARCH_NAME = {
   'arm': 'arm',
   'x86_32': 'i686',
   'i686': 'i686',
   'x86_64': 'x86_64'
 }
 
 ARCH_ALT_NAME = {
   'arm': 'arm',
   'x86_32': 'x86_32',
@@ skipping 49 matching lines @@
 
 def ExpectToolchain(toolchain, expected_toolchains):
   Expect(toolchain in expected_toolchains,
          'Expected toolchain to be one of [%s], not %s.' % (
              ', '.join(expected_toolchains), toolchain))
 
 
 def ExpectArch(arch, expected_arches):
   Expect(arch in expected_arches,
          'Expected arch to be one of [%s], not %s.' % (
-             ', '.join(expected_arches), arch))
+             ', '.join(map(str, expected_arches)), arch))
 
 
 def CheckValidToolchainArch(toolchain, arch, arch_required=False):
   if toolchain or arch or arch_required:
     ExpectToolchain(toolchain, VALID_TOOLCHAINS)
 
   if toolchain in HOST_TOOLCHAINS:
     Expect(arch is None,
            'Expected no arch for host toolchain %r. Got %r.' % (
                toolchain, arch))
   elif toolchain == 'pnacl':
-    Expect(arch is None,
+    Expect(arch is None or arch == 'pnacl',
            'Expected no arch for toolchain %r. Got %r.' % (toolchain, arch))
   elif arch_required:
     Expect(arch is not None,
            'Expected arch to be one of [%s] for toolchain %r.\n'
            'Use the -a or --arch flags to specify one.\n' % (
                ', '.join(VALID_ARCHES), toolchain))
 
   if arch:
-    ExpectArch(arch, VALID_ARCHES)
+    if toolchain == 'pnacl':
+      ExpectArch(arch, VALID_PNACL_ARCHES)
+    else:
+      ExpectArch(arch, VALID_ARCHES)
+
     if arch == 'arm':
       Expect(toolchain == 'newlib', 'The arm arch only supports newlib.')
 
 
 def GetArchName(arch):
   return ARCH_NAME.get(arch)
 
 
 def GetArchAltName(arch):
   return ARCH_ALT_NAME.get(arch)
@@ skipping 15 matching lines @@
     return sdk_path.replace('\\', '/')
   else:
     return sdk_path
 
 
 def GetToolchainDir(toolchain, arch=None):
   ExpectToolchain(toolchain, NACL_TOOLCHAINS)
   root = GetPosixSDKPath()
   platform = getos.GetPlatform()
   if toolchain == 'pnacl':
-    assert arch is None
     subdir = '%s_pnacl' % platform
   else:
     assert arch is not None
     subdir = '%s_%s_%s' % (platform, GetArchBaseName(arch), toolchain)
 
   return posixpath.join(root, 'toolchain', subdir)
 
 
 def GetToolchainArchDir(toolchain, arch):
   ExpectToolchain(toolchain, NACL_TOOLCHAINS)
@@ skipping 97 matching lines @@
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)