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

Set correct required_ruby_version when some RUBY_CC_VERSIONs are missing #199

Merged
merged 1 commit into from Jan 17, 2022

Conversation

larskanis
Copy link
Member

The required_ruby_version was set twice, although one in define_native_tasks is enough.

The original commit that introduced automatic setting of required_ruby_version was 0dc2350 . It detected the ruby version entirely based on RUBY_CC_VERSION. Later on there was commit 0dc2350 which introduced setting the required_ruby_version for native but not cross gems and only for the active ruby versions. This made the first detection obsolete, but it wasn't deleted so far. This is fixed by this PR.

Fixes #198

…missing

The required_ruby_version was set twice, although one in define_native_tasks is enough.

Fixes rake-compiler#198
@@ -377,9 +377,6 @@ def define_cross_platform_tasks(for_platform)
@lib_dir = "#{@lib_dir}/#{$1}"
end

# Update cross compiled platform/version combinations
@ruby_versions_per_platform[for_platform] << version
Copy link
Member

Choose a reason for hiding this comment

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

This line was added in #166 by you.
Could you confirm that this doesn't break #166 case?

Copy link
Member Author

Choose a reason for hiding this comment

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

Originally it was added in #137, but modified later on and it was actually obsoleted by #166, but I didn't notice that.
I can confirm that both use cases (#137 and #166) work properly.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks.

@kou kou merged commit 2b67583 into rake-compiler:master Jan 17, 2022
@flavorjones
Copy link
Contributor

Thank you both!

flavorjones added a commit to sparklemotion/nokogiri that referenced this pull request Jan 18, 2022
which contains rake-compiler/rake-compiler#199
and remove the workaround for ruby required versions
flavorjones added a commit to sparklemotion/nokogiri that referenced this pull request Jan 19, 2022
which contains rake-compiler/rake-compiler#199
and remove the workaround for ruby required versions
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.

Set correct required_ruby_version when some RUBY_CC_VERSIONs are missing
3 participants