Whitelist MACOSX_DEPLOYMENT_TARGET #1561
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jakirkham
commented
Nov 29, 2016
| @@ -385,6 +385,8 @@ def unix_vars(prefix): | |||
|
|
|||
| def osx_vars(compiler_vars, config): | |||
| OSX_ARCH = 'i386' if config.arch == 32 else 'x86_64' | |||
| MACOSX_DEPLOYMENT_TARGET = os.environ.get('MACOSX_DEPLOYMENT_TARGET', '10.7') | |||
|
|
|||
| compiler_vars['CFLAGS'] += ' -arch {0}'.format(OSX_ARCH) | |||
| compiler_vars['CXXFLAGS'] += ' -arch {0}'.format(OSX_ARCH) | |||
There was a problem hiding this comment.
We could also add -mmacosx-version-min for good measure.
There was a problem hiding this comment.
I'm fine to merge this as is. If you want to add that later, let's discuss more at that time.
|
Thanks. This should hopefully help reduce the kludge. |
|
Agreed. Thanks Mike. |
|
Hi there, thank you for your contribution! This pull request has been automatically locked because it has not had recent activity after being closed. Please open a new issue or pull request if needed. Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1269 (though I suppose PR #1278 should have already)
As promised, whitelist the environment variable
MACOSX_DEPLOYMENT_TARGETso that people can override it with an external environment variable easily.cc @msarahan