Skip to content

Commit 0e5171a

Browse files
shawwnrefack
authored andcommitted
src,macos: fix mutually exclusive flags
If IPHONEOS_DEPLOYMENT_TARGET is specified, don't append MACOSX_DEPLOYMENT_TARGET flags.
1 parent 8806c63 commit 0e5171a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

gyp/xcode_emulation.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ def _XcodeSdkPath(self, sdk_root):
525525
return XcodeSettings._sdk_path_cache[sdk_root]
526526

527527
def _AppendPlatformVersionMinFlags(self, lst):
528-
self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
529528
if 'IPHONEOS_DEPLOYMENT_TARGET' in self._Settings():
530529
# TODO: Implement this better?
531530
sdk_path_basename = os.path.basename(self._SdkPath())
@@ -535,6 +534,8 @@ def _AppendPlatformVersionMinFlags(self, lst):
535534
else:
536535
self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET',
537536
'-miphoneos-version-min=%s')
537+
else:
538+
self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
538539

539540
def GetCflags(self, configname, arch=None):
540541
"""Returns flags that need to be added to .c, .cc, .m, and .mm

0 commit comments

Comments
 (0)