xcode_emulation: fix on CLT-only systems redux

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 312 matching lines @@
   def GetCflags(self, configname, arch=None):
     """Returns flags that need to be added to .c, .cc, .m, and .mm
     compilations."""
     # This functions (and the similar ones below) do not offer complete
     # emulation of all xcode_settings keys. They're implemented on demand.
 
     self.configname = configname
     cflags = []
 
     sdk_root = self._SdkPath()
-    if sdk_root:
+    if 'SDKROOT' in self._Settings() and sdk_root:
       cflags.append('-isysroot %s' % sdk_root)
 
     if self._Test('CLANG_WARN_CONSTANT_CONVERSION', 'YES', default='NO'):
       cflags.append('-Wconstant-conversion')
 
     if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'):
       cflags.append('-funsigned-char')
 
     if self._Test('GCC_CW_ASM_SYNTAX', 'YES', default='YES'):
       cflags.append('-fasm-blocks')
@@ skipping 288 matching lines @@
     if self._Test('PREBINDING', 'YES', default='NO'):
       ldflags.append('-Wl,-prebind')
 
     self._Appendf(
         ldflags, 'DYLIB_COMPATIBILITY_VERSION', '-compatibility_version %s')
     self._Appendf(
         ldflags, 'DYLIB_CURRENT_VERSION', '-current_version %s')
 
     self._AppendPlatformVersionMinFlags(ldflags)
 
-    if self._SdkPath():
+    if 'SDKROOT' in self._Settings() and self._SdkPath():
       ldflags.append('-isysroot ' + self._SdkPath())
 
     for library_path in self._Settings().get('LIBRARY_SEARCH_PATHS', []):
       ldflags.append('-L' + gyp_to_build_path(library_path))
 
     if 'ORDER_FILE' in self._Settings():
       ldflags.append('-Wl,-order_file ' +
                      '-Wl,' + gyp_to_build_path(
                                   self._Settings()['ORDER_FILE']))
 
@@ skipping 200 matching lines @@
   def _AdjustLibrary(self, library, config_name=None):
     if library.endswith('.framework'):
       l = '-framework ' + os.path.splitext(os.path.basename(library))[0]
     else:
       m = self.library_re.match(library)
       if m:
         l = '-l' + m.group(1)
       else:
         l = library
 
-    if self._SdkPath():
-      sdk_root = self._SdkPath(config_name)
-    else:
+    sdk_root = self._SdkPath(config_name)
+    if not sdk_root:

[Nico, 2013/12/24 19:16:21]

`sdk_root is None` maybe?

       sdk_root = ''
     return l.replace('$(SDKROOT)', sdk_root)
 
   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
@@ skipping 514 matching lines @@
         new_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos'
       target_dict['configurations'][new_config_name] = new_config_dict
   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