Remove direct references to hermetic mac toolchain.

tools/clang/scripts/update.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.
 
 """This script is used to download prebuilt clang binaries.
 
 It is also used by package.py to build the prebuilt clang binaries."""
 
 import argparse
@@ skipping 149 matching lines @@
 def WriteStampFile(s, path=STAMP_FILE):
   """Write s to the stamp file."""
   EnsureDirExists(os.path.dirname(path))
   with open(path, 'w') as f:
     f.write(s)
     f.write('\n')
 
 
 def GetSvnRevision(svn_repo):
   """Returns current revision of the svn repo at svn_repo."""
-  if sys.platform == 'darwin':
-    # mac_files toolchain must be set for hermetic builds.
-    root = os.path.dirname(os.path.dirname(os.path.dirname(
-        os.path.dirname(__file__))))
-    sys.path.append(os.path.join(root, 'build'))
-    import mac_toolchain
-
-    mac_toolchain.SetToolchainEnvironment()
   svn_info = subprocess.check_output('svn info ' + svn_repo, shell=True)

[justincohen, 2016/10/13 20:34:22]

I wonder what changed -- this used to fail before with hermetic

[erikchen, 2016/10/13 20:42:48]

The only thing I can think of is that when this failed, it was failing on a
machine with neither CLT nor XCode. That's starting to look more and more like
an unrealistic condition for us to try to work around. We should assume that the
system already has at least a CLT install.

   m = re.search(r'Revision: (\d+)', svn_info)
   return m.group(1)
 
 
 def RmTree(dir):
   """Delete dir."""
   def ChmodAndRetry(func, path, _):
     # Subversion can leave read-only files around.
     if not os.access(path, os.W_OK):
       os.chmod(path, stat.S_IWUSR)
@@ skipping 711 matching lines @@
     args.force_local_build = True
     if 'OS=android' not in os.environ.get('GYP_DEFINES', ''):
       # Only build the Android ASan rt on ToT bots when targetting Android.
       args.with_android = False
 
   return UpdateClang(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())