[NaCl SDK] Cleanup references to old newlib toolchain

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 110 matching lines @@
   else:
     lib_suffix = ''
 
   tcdir = 'tc_' + GetToolchainLibc(tcname)
 
   if tcname == 'pnacl':
     if arch is None:
       lib_suffix = ''
       tcdir = 'tc_pnacl_newlib'
       arch = 'x64'
-    else:
-      arch = 'clang-' + arch
 
   return os.path.join(GetNinjaOutDir(arch), 'gen', tcdir, 'lib' + lib_suffix)
 
 
 def GetToolchainNaClLib(tcname, tcpath, arch):
   if arch == 'ia32':
     return os.path.join(tcpath, 'x86_64-nacl', 'lib32')
   elif arch == 'x64':
     return os.path.join(tcpath, 'x86_64-nacl', 'lib')
   elif arch == 'arm':
@@ skipping 261 matching lines @@
 
   InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_64)
   InstallFiles(GetNinjaOutDir('ia32'), tools_dir, tools_files_32)
   InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files)
 
   for tc in toolchains:
     if tc in ('host', 'clang-newlib'):
       continue
     elif tc == 'pnacl':
       xarches = (None, 'ia32', 'x64', 'arm')
-    elif tc in ('x86_glibc', 'x86_newlib'):
+    elif tc in ('x86_glibc'):
       xarches = ('ia32', 'x64')
     elif tc == 'arm_glibc':
       xarches = ('arm',)
     else:
       raise AssertionError('unexpected toolchain value: %s' % tc)
 
     for xarch in xarches:
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       libc = GetToolchainLibc(tc)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[libc])
 
 
 def GypNinjaBuild_NaCl(rel_out_dir):
   gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
   out_dir_32 = MakeNinjaRelPath(rel_out_dir + '-ia32')
   out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-x64')
   out_dir_arm = MakeNinjaRelPath(rel_out_dir + '-arm')
-  out_dir_clang_32 = MakeNinjaRelPath(rel_out_dir + '-clang-ia32')
-  out_dir_clang_64 = MakeNinjaRelPath(rel_out_dir + '-clang-x64')
-  out_dir_clang_arm = MakeNinjaRelPath(rel_out_dir + '-clang-arm')
 
-  GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_32,
-                gyp_defines=['use_nacl_clang=0'])
-  GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_64,
-                gyp_defines=['use_nacl_clang=0'])
-  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm,
-                gyp_defines=['use_nacl_clang=0'])
-  GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
-      out_dir_clang_32, gyp_defines=['use_nacl_clang=1'])
-  GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
-      out_dir_clang_64, gyp_defines=['use_nacl_clang=1'])
-  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
-      out_dir_clang_arm, gyp_defines=['use_nacl_clang=1'])
+  GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_32)
+  GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_64)
+  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm)
   GypNinjaBuild('x64', gyp_py, all_gyp, 'ncval_new', out_dir_64)
 
 
 def GypNinjaBuild_Breakpad(rel_out_dir):
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if getos.GetPlatform() == 'win':
     return
 
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'breakpad', 'breakpad.gyp')
   build_list = ['dump_syms', 'minidump_dump', 'minidump_stackwalk']
   GypNinjaBuild('x64', gyp_py, gyp_file, build_list, out_dir)
 
 
-def GypNinjaBuild_PPAPI(arch, rel_out_dir, gyp_defines=None):
+def GypNinjaBuild_PPAPI(arch, rel_out_dir):
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client',
                           'native_client.gyp')
-  GypNinjaBuild(arch, gyp_py, gyp_file, 'ppapi_lib', out_dir,
-                gyp_defines=gyp_defines)
+  GypNinjaBuild(arch, gyp_py, gyp_file, 'ppapi_lib', out_dir)
 
 
 def GypNinjaBuild_Pnacl(rel_out_dir, target_arch):
   # TODO(binji): This will build the pnacl_irt_shim twice; once as part of the
   # Chromium build, and once here. When we move more of the SDK build process
   # to gyp, we can remove this.
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
 
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
                           'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
   targets = ['aot']
   GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir)
 
 
-def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
-                  out_dir, gyp_defines=None):
+def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
   gyp_env = dict(os.environ)
   gyp_env['GYP_GENERATORS'] = 'ninja'
-  gyp_defines = gyp_defines or []
-  gyp_defines.append('nacl_allow_thin_archives=0')
-  if not options.no_use_sysroot:
-    gyp_defines.append('use_sysroot=1')
+  gyp_defines = ['nacl_allow_thin_archives=0', 'use_nacl_clang=1']
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
 
   if arch is not None:
     gyp_defines.append('target_arch=%s' % arch)
     if arch == 'arm':
       gyp_env['GYP_CROSSCOMPILE'] = '1'
       if options.no_arm_trusted:
         gyp_defines.append('disable_cross_trusted=1')
-  if getos.GetPlatform() == 'mac':
-    gyp_defines.append('clang=1')
 
   gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
   # We can't use windows path separators in GYP_GENERATOR_FLAGS since
   # gyp uses shlex to parse them and treats '\' as an escape char.
   gyp_env['GYP_GENERATOR_FLAGS'] = 'output_dir=%s' % out_dir.replace('\\', '/')
 
   # Print relevant environment variables
   for key, value in gyp_env.iteritems():
     if key.startswith('GYP') or key in ('CC',):
       print '  %s="%s"' % (key, value)
@@ skipping 18 matching lines @@
 
   if clean:
     for dirname in glob.glob(os.path.join(OUT_DIR, GYPBUILD_DIR + '*')):
       buildbot_common.RemoveDir(dirname)
     build = True
 
   if build:
     GypNinjaBuild_NaCl(GYPBUILD_DIR)
     GypNinjaBuild_Breakpad(GYPBUILD_DIR + '-x64')
 
-    if set(toolchains) & set(['x86_glibc', 'x86_newlib']):
-      GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-ia32',
-                          ['use_nacl_clang=0'])
-      GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64',
-                          ['use_nacl_clang=0'])
+    if 'x86_glibc' in toolchains or 'pnacl' in toolchains:
+      GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-ia32')
+      GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64')
 
-    if 'arm_glibc' in toolchains:
-      GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm',
-                          ['use_nacl_clang=0'] )
+    if 'arm_glibc' in toolchains or 'pnacl' in toolchains:
+      GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm')
 
     if 'pnacl' in toolchains:
-      GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-clang-ia32',
-                          ['use_nacl_clang=1'])
-      GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-clang-x64',
-                          ['use_nacl_clang=1'])
-      GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-clang-arm',
-                          ['use_nacl_clang=1'])
-
       # NOTE: For ia32, gyp builds both x86-32 and x86-64 by default.
       for arch in ('ia32', 'arm'):
         # Fill in the latest native pnacl shim library from the chrome build.
         build_dir = GYPBUILD_DIR + '-pnacl-' + arch
         GypNinjaBuild_Pnacl(build_dir, arch)
 
   GypNinjaInstall(pepperdir, toolchains)
 
   for toolchain in toolchains:
     if toolchain not in ('host', 'clang-newlib'):
@@ skipping 410 matching lines @@
       BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')