patch to 6.0.4

refack/GYP3@6a5d254

gyp/gyp/input.py

@@ -958,7 +958,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
  if variable_name in variables:
  # If the variable is already set, don't set it.
  continue
- if the_dict_key is 'variables' and variable_name in the_dict:
+ if the_dict_key == 'variables' and variable_name in the_dict:
  # If the variable is set without a % in the_dict, and the_dict is a
  # variables dict (making |variables| a varaibles sub-dict of a
  # variables dict), use the_dict's definition.

gyp/gyp/xcode_emulation.py

@@ -525,7 +525,6 @@ def _XcodeSdkPath(self, sdk_root):
  return XcodeSettings._sdk_path_cache[sdk_root]
 
  def _AppendPlatformVersionMinFlags(self, lst):
- self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
  if 'IPHONEOS_DEPLOYMENT_TARGET' in self._Settings():
  # TODO: Implement this better?
  sdk_path_basename = os.path.basename(self._SdkPath())
@@ -535,6 +534,8 @@ def _AppendPlatformVersionMinFlags(self, lst):
  else:
  self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET',
  '-miphoneos-version-min=%s')
+ else:
+ self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
 
  def GetCflags(self, configname, arch=None):
  """Returns flags that need to be added to .c, .cc, .m, and .mm