mac: Extend libtool filter to also match fat builds.

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 210 matching lines @@
   def ExecFlock(self, lockfile, *cmd_list):
     """Emulates the most basic behavior of Linux's flock(1)."""
     # Rely on exception handling to report errors.
     fd = os.open(lockfile, os.O_RDONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
     fcntl.flock(fd, fcntl.LOCK_EX)
     return subprocess.call(cmd_list)
 
   def ExecFilterLibtool(self, *cmd_list):
     """Calls libtool and filters out '/path/to/libtool: file: foo.o has no
     symbols'."""
-    libtool_re = re.compile(r'^.*libtool: file: .* has no symbols$')
+    libtool_re = re.compile(r'^.*libtool: (?:for architecture: \S* )?'
+                            r'file: .* has no symbols$')
     libtool_re5 = re.compile(
         r'^.*libtool: warning for library: ' +
         r'.* the table of contents is empty ' +
         r'\(no object file members in the library define global symbols\)$')
     env = os.environ.copy()
     # Ref:
     # http://www.opensource.apple.com/source/cctools/cctools-809/misc/libtool.c
     # The problem with this flag is that it resets the file mtime on the file to
     # epoch=0, e.g. 1970-1-1 or 1969-12-31 depending on timezone.
     env['ZERO_AR_DATE'] = '1'
@@ skipping 359 matching lines @@
         data = data.replace('$(%s)' % key, value)
       return data
     if isinstance(data, list):
       return [self._ExpandVariables(v, substitutions) for v in data]
     if isinstance(data, dict):
       return {k: self._ExpandVariables(data[k], substitutions) for k in data}
     return data
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))