Restore build on OSX, where make defines CXX as "c++" by default.#705
Merged
matthiaskrgr merged 1 commit intoNov 14, 2015
Merged
Conversation
simartin
referenced
this pull request
Nov 14, 2015
Collaborator
|
Okay, thanks! |
matthiaskrgr
added a commit
that referenced
this pull request
Nov 14, 2015
Restore build on OSX, where make defines CXX as "c++" by default.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Hi,
Build on OSX is broken since 11915f8 because make on this platform defines CXX as c++, and -std=c++0x is not appended to CXXFLAGS. This patch fixes this by handling the "CXX=c++ and OS=OSX" case appropriately. Thanks to consider merging.
Cheers,
Simon
PS: One can find the default value make gives to CXX by issuing "make -p | grep 'CXX ='"