[NaCl SDK] Use nacl_config.py in common.mk build system.

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.
 """
 
@@ skipping 173 matching lines @@
 
 def GetToolPath(toolchain, arch, tool):
   if tool == 'gdb':
     # Always use the same gdb; it supports multiple toolchains/architectures.
     # NOTE: this is always a i686 executable. i686-nacl-gdb is a symlink to
     # x86_64-nacl-gdb.
     return posixpath.join(GetToolchainBinDir('newlib', 'x86_64'),
                         'x86_64-nacl-gdb')
 
   if toolchain == 'pnacl':
+    CheckValidToolchainArch(toolchain, arch)
     tool = PNACL_TOOLS.get(tool, tool)
     full_tool_name = 'pnacl-%s' % tool
   else:
+    CheckValidToolchainArch(toolchain, arch, arch_required=True)
     ExpectArch(arch, VALID_ARCHES)
     tool = NACL_TOOLS.get(tool, tool)
     full_tool_name = '%s-nacl-%s' % (GetArchName(arch), tool)
   return posixpath.join(GetToolchainBinDir(toolchain, arch), full_tool_name)
 
 
 def GetCFlags(toolchain):
   ExpectToolchain(toolchain, VALID_TOOLCHAINS)
   return ' '.join('-I%s' % dirname for dirname in GetSDKIncludeDirs(toolchain))
 
 
+def GetIncludeDirs(toolchain):
+  ExpectToolchain(toolchain, VALID_TOOLCHAINS)
+  return ' '.join(GetSDKIncludeDirs(toolchain))
+
+
 def GetLDFlags():
   return '-L%s' % GetSDKLibDir()
 
 
 def main(args):
   usage = 'Usage: %prog [options] <command>'
   parser = optparse.OptionParser(usage=usage, description=__doc__)
   parser.add_option('-t', '--toolchain', help='toolchain name. This can also '
                     'be specified with the NACL_TOOLCHAIN environment '
                     'variable.')
   parser.add_option('-a', '--arch', help='architecture name. This can also be '
                     'specified with the NACL_ARCH environment variable.')
 
   group = optparse.OptionGroup(parser, 'Commands')
   group.add_option('--tool', help='get tool path')
   group.add_option('--cflags',
                     help='output all preprocessor and compiler flags',
                     action='store_true')
   group.add_option('--libs', '--ldflags', help='output all linker flags',
                     action='store_true')
+  group.add_option('--include-dirs',
+                   help='output include dirs, separated by spaces',
+                   action='store_true')
   parser.add_option_group(group)
 
   options, _ = parser.parse_args(args)
 
   # Get toolchain/arch from environment, if not specified on commandline
   options.toolchain = options.toolchain or os.getenv('NACL_TOOLCHAIN')
   options.arch = options.arch or os.getenv('NACL_ARCH')
 
   options.toolchain = CanonicalizeToolchain(options.toolchain)
   CheckValidToolchainArch(options.toolchain, options.arch)
 
   if options.cflags:
     print GetCFlags(options.toolchain)
+  elif options.include_dirs:
+    print GetIncludeDirs(options.toolchain)
   elif options.libs:
     print GetLDFlags()
   elif options.tool:
-    CheckValidToolchainArch(options.toolchain, options.arch, True)
     print GetToolPath(options.toolchain, options.arch, options.tool)
   else:
     parser.error('Expected a command. Run with --help for more information.')
 
   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)