Fallback to '.tbd' for system missing '.dylib'.

pylib/gyp/xcode_emulation.py

 # 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.
 
 """
 This module contains classes that help to emulate xcodebuild behavior on top of
 other build systems, such as make and ninja.
 """
 
 import copy
@@ skipping 1014 matching lines @@
     else:
       m = self.library_re.match(library)
       if m:
         l = '-l' + m.group(1)
       else:
         l = library
 
     sdk_root = self._SdkPath(config_name)
     if not sdk_root:
       sdk_root = ''
-    return l.replace('$(SDKROOT)', sdk_root)
+    if l.startswith('$(SDKROOT)'):
+      library = l.replace('$(SDKROOT)', sdk_root)
+      basename, ext = os.path.splitext(library)
+      if ext == '.dylib' and not os.path.exists(library):
+        tbd_library = basename + '.tbd'
+        if not os.path.exists(library) and os.path.exists(tbd_library):
+          l = os.path.splitext(l)[0] + '.tbd'
+    l = l.replace('$(SDKROOT)', sdk_root)

[Mark Mentovai, 2015/08/10 18:41:44]

I don’t like the double-replace of SDKROOT.

[sdefresne, 2015/08/11 07:42:59]

Fixed (with the double os.path.exists(library) too).

+    return l
 
   def AdjustLibraries(self, libraries, config_name=None):
     """Transforms entries like 'Cocoa.framework' in libraries into entries like
     '-framework Cocoa', 'libcrypto.dylib' into '-lcrypto', etc.
     """
     libraries = [self._AdjustLibrary(library, config_name)
                  for library in libraries]
     return libraries
 
   def _BuildMachineOSBuild(self):
@@ skipping 555 matching lines @@
       if toolset == 'target':
         iphoneos_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos'
   return targets
 
 def CloneConfigurationForDeviceAndEmulator(target_dicts):
   """If |target_dicts| contains any iOS targets, automatically create -iphoneos
   targets for iOS device builds."""
   if _HasIOSTarget(target_dicts):
     return _AddIOSDeviceConfigurations(target_dicts)
   return target_dicts