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.

Sign up for GitHub

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

Jump to bottom

Relax rustc version to 1.58.1 #2030

Merged
merged 2 commits into from Sep 1, 2022
Merged

Relax rustc version to 1.58.1 #2030

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c0ac3
Relax rustc version from 1.58.1
hsbt Sep 1, 2022
e71c4b9
Fix * regex usage of bash
hsbt Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/ruby-build
View file
Open in desktop
Expand Up @@ -1285,8 +1285,8 @@ build_package_enable_yjit() {

local rustc_ver="$(rustc --version 2>/dev/null)"
[ -n "$rustc_ver" ] || return 0
# Some kind of built-in bash comparison for dotted version strings would be awesome.
if [[ "${rustc_ver}" == *"rustc 1."[6789]* ]]; then
# YJIT supports Rust 1.58.1 and later
if [[ "${rustc_ver}" =~ ^rustc\ 1\.(58\.1|59\.|[6789]\d\.) ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

Should it accept 1.58.2 till 1.58.9?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think there are releases with those numbers: https://github.com/rust-lang/rust/blob/master/RELEASES.md

echo "Building with YJIT by default because ${rustc_ver} is installed; add RUBY_CONFIGURE_OPTS='--disable-yjit' to disable explicitly" >&3
package_option ruby configure --enable-yjit
else
Expand Down