From 4981a7043fc141060b56faeb04bf614d85aadd1f Mon Sep 17 00:00:00 2001 From: Shawn Presser Date: Thu, 2 May 2019 05:26:38 -0500 Subject: [PATCH] gyp: fix IPHONEOS_DEPLOYMENT_TARGET If IPHONEOS_DEPLOYMENT_TARGET is specified, don't append MACOSX_DEPLOYMENT_TARGET flags. --- gyp/pylib/gyp/xcode_emulation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gyp/pylib/gyp/xcode_emulation.py b/gyp/pylib/gyp/xcode_emulation.py index 66f325932a..8e2cbcf784 100644 --- a/gyp/pylib/gyp/xcode_emulation.py +++ b/gyp/pylib/gyp/xcode_emulation.py @@ -458,7 +458,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()) @@ -468,6 +467,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