ninja/mac: allow path-based specification of SDKROOT

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 gyp.common
@@ skipping 226 matching lines @@
           out.rstrip(), 'Platforms/MacOSX.platform/Developer/SDKs')
       if os.path.isdir(xcode43_sdk_path):
         XcodeSettings._sdk_base_dir = xcode43_sdk_path
       else:
         XcodeSettings._sdk_base_dir = os.path.join(out.rstrip(), 'SDKs')
     return XcodeSettings._sdk_base_dir
 
   def _SdkPath(self):
     sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx10.5')
     if sdk_root.startswith('macosx'):
-      sdk_root = 'MacOSX' + sdk_root[len('macosx'):]
-    return os.path.join(self._GetSdkBaseDir(), '%s.sdk' % sdk_root)
+      return os.path.join(self._GetSdkBaseDir(),
+                          'MacOSX' + sdk_root[len('macosx'):] + '.sdk')
+    return sdk_root
 
   def GetCflags(self, configname):
     """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 = []
 
@@ skipping 775 matching lines @@
 def GetSpecPostbuildCommands(spec, quiet=False):
   """Returns the list of postbuilds explicitly defined on |spec|, in a form
   executable by a shell."""
   postbuilds = []
   for postbuild in spec.get('postbuilds', []):
     if not quiet:
       postbuilds.append('echo POSTBUILD\\(%s\\) %s' % (
             spec['target_name'], postbuild['postbuild_name']))
     postbuilds.append(gyp.common.EncodePOSIXShellList(postbuild['action']))
   return postbuilds