Use xcrun instead of DEVELOPER_BIN_DIR to deal with tools that keep moving around

pylib/gyp/mac_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions to perform Xcode-style build steps.
 
 These functions are executed via gyp-mac-tool when using the Makefile generator.
 """
 
@@ skipping 42 matching lines @@
       shutil.copytree(source, dest)
     elif extension == '.xib':
       return self._CopyXIBFile(source, dest)
     elif extension == '.strings':
       self._CopyStringsFile(source, dest)
     else:
       shutil.copyfile(source, dest)
 
   def _CopyXIBFile(self, source, dest):
     """Compiles a XIB file with ibtool into a binary plist in the bundle."""
-    tools_dir = os.environ.get('DEVELOPER_BIN_DIR', '/usr/bin')
-    args = [os.path.join(tools_dir, 'ibtool'), '--errors', '--warnings',
-        '--notices', '--output-format', 'human-readable-text', '--compile',
-        dest, source]
+    args = ['xcrun', 'ibtool', '--errors', '--warnings', '--notices',
+        '--output-format', 'human-readable-text', '--compile', dest, source]
     ibtool_section_re = re.compile(r'/\*.*\*/')
     ibtool_re = re.compile(r'.*note:.*is clipping its content')
     ibtoolout = subprocess.Popen(args, stdout=subprocess.PIPE)
     current_section_header = None
     for line in ibtoolout.stdout:
       if ibtool_section_re.match(line):
         current_section_header = line
       elif not ibtool_re.match(line):
         if current_section_header:
           sys.stdout.write(current_section_header)
@@ skipping 167 matching lines @@
   def _Relink(self, dest, link):
     """Creates a symlink to |dest| named |link|. If |link| already exists,
     it is overwritten."""
     if os.path.lexists(link):
       os.remove(link)
     os.symlink(dest, link)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))