Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the darwin area of the Makefile to more accurate variable nam… #100

Merged
merged 6 commits into from
Oct 16, 2016

Conversation

aaronc100
Copy link
Contributor

…es: changed OS_VERSION to OSX_SDK_VERSION.

@aaronc100
Copy link
Contributor Author

aaronc100 commented Oct 15, 2016

Most of these changes are based upon @tl0gic comments to my last PR. Thanks!

@robertswiecki
Copy link
Collaborator

Hi @tl0gic - will you take this - I've already too much mess to the macos :)

endif

ifneq (,$(findstring 10.12,$(OSX_SDK_VERSION)))
SDK_NAME := "macosx10.12"
else ifneq (,$(findstring 10.11,$(OSX_SDK_VERSION)))
# El Capitan didn't break compatibility
SDK_NAME := "macosx10.11"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can avoid the if/else conditions here if we do something like this:
SDK_NAME := macosx$(OSX_SDK_VERSION)

What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, def, let me give that a shot!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tl0gic Please take a look now; let me know what you think!

@tl0gic
Copy link
Contributor

tl0gic commented Oct 15, 2016

Hey @robertswiecki, sure thing!

@aaronc100 thanks for doing this! I think overall it looks good, I left you one small comment. Let me know what you think.

@tl0gic tl0gic merged commit ae6f64a into google:master Oct 16, 2016
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.

None yet

3 participants