Skip to content

src,macos: fix mutually exclusive flags#42

Merged
refack merged 1 commit into
refack:masterfrom
shawwn:ios
May 2, 2019
Merged

src,macos: fix mutually exclusive flags#42
refack merged 1 commit into
refack:masterfrom
shawwn:ios

Conversation

@shawwn

@shawwn shawwn commented May 2, 2019

Copy link
Copy Markdown
Contributor

If IPHONEOS_DEPLOYMENT_TARGET is specified, don't append MACOSX_DEPLOYMENT_TARGET flags.

When building for iOS, it's an error to have both -mmacosx-version-min=... and -miphoneos-version-min=... compiler flags.

This PR ensures that if IPHONEOS_DEPLOYMENT_TARGET is specified, no -mmacosx-version-min=... flags will be emitted.

See also nodejs/node-gyp#1737

If IPHONEOS_DEPLOYMENT_TARGET is specified, don't append
MACOSX_DEPLOYMENT_TARGET flags.
@refack

refack commented May 2, 2019

Copy link
Copy Markdown
Owner

Thank you for following up!

@refack refack changed the title gyp: fix IPHONEOS_DEPLOYMENT_TARGET src,macos: fix mutually exclusive flags May 2, 2019
@refack refack merged commit 0e5171a into refack:master May 2, 2019
@refack

refack commented May 2, 2019

Copy link
Copy Markdown
Owner

@shawwn will you be willing to write a test for this fix? Maybe something based on https://github.com/refack/GYP/blob/0e5171ac64f5241e1428f929474c246c2d226b28/test/mac/gyptest-deployment-target.py#L22

@shawwn

shawwn commented May 4, 2019

Copy link
Copy Markdown
Contributor Author

Sure, see #45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants