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

Fix C++ compiler selection #530

Merged
merged 3 commits into from
Jul 22, 2016
Merged

Conversation

mrkn
Copy link

@mrkn mrkn commented Jul 17, 2016

NOTE: please merge #524 before this because this pull-request based on that pull-request.

This pull-request allows us to select the collect combination of C++ and C compilers on OS X.

In Ruby < 2.4, configure script couldn't select the collect C++ compiler for the specified C compiler (I've fixed it on Ruby 2.4).
The changes in this is overwrite CXX variable to clang++ when CC is clang.
#525 will be fixed by this.

@mrkn
Copy link
Author

mrkn commented Jul 17, 2016

https://travis-ci.org/SciRuby/nmatrix/jobs/145353918

This failure isn't related to this pull-request.
But I think this failure should be investigated by someone so I created a new issue #531 about that.

@@ -107,6 +107,12 @@ def gplusplus_version
"#{major}.#{minor}.#{patch}"
end

if CONFIG['CC'] == 'clang' && CONFIG['CXX'] != 'clang++'
puts "WARNING: CONFIG['CXX'] is not 'clang++' in spite of CONFIG['CC'] is 'clang'.",
Copy link
Member

Choose a reason for hiding this comment

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

Needs a grammar correction. "in spite of" -> "even though" or ", however"

@translunar
Copy link
Member

translunar commented Jul 18, 2016

These are all excellent changes. Just one minor tweak. Thanks for submitting them.

@translunar
Copy link
Member

@mrkn Just wanted to make sure you saw the comment above.

@mrkn
Copy link
Author

mrkn commented Jul 21, 2016

@MohawkJohn Fixed.
Sorry for late response, and thanks to check my wrong English.

@mrkn
Copy link
Author

mrkn commented Jul 21, 2016

And I've rebase onto the current master branch.

@translunar translunar merged commit cc357ca into SciRuby:master Jul 22, 2016
@translunar
Copy link
Member

Great work. Thanks so much!

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