Don't put MicroJIT status in RUBY_DESCRIPTION

That messes with tests too much.
This commit is contained in:
Alan Wu 2020-10-05 12:52:43 -04:00
Родитель 2790428e55
Коммит df15dfa6fd
1 изменённых файлов: 8 добавлений и 26 удалений

Просмотреть файл

@ -42,9 +42,7 @@ const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM;
const int ruby_patchlevel = RUBY_PATCHLEVEL;
const char ruby_description[] = RUBY_DESCRIPTION_WITH("");
const char ruby_description_with_ujit[] = RUBY_DESCRIPTION_WITH(" +UJIT");
static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT");
static const char ruby_description_with_both_jits[] = RUBY_DESCRIPTION_WITH(" +JIT +UJIT");
const char ruby_copyright[] = RUBY_COPYRIGHT;
const char ruby_engine[] = "ruby";
@ -105,20 +103,10 @@ Init_ruby_description(void)
VALUE description;
if (MJIT_OPTS_ON) {
if (rb_ujit_enabled_p()) {
description = MKSTR(description_with_both_jits);
}
else {
description = MKSTR(description_with_jit);
}
description = MKSTR(description_with_jit);
}
else {
if (rb_ujit_enabled_p()) {
description = MKSTR(description_with_ujit);
}
else {
description = MKSTR(description);
}
description = MKSTR(description);
}
/*
@ -131,20 +119,14 @@ void
ruby_show_version(void)
{
if (MJIT_OPTS_ON) {
if (rb_ujit_enabled_p()) {
PRINT(description_with_both_jits);
}
else {
PRINT(description_with_jit);
}
PRINT(description_with_jit);
}
else {
if (rb_ujit_enabled_p()) {
PRINT(description_with_ujit);
}
else {
PRINT(description);
}
PRINT(description);
}
if (rb_ujit_enabled_p()) {
fputs("MicroJIT is on\n", stdout);
}
#ifdef RUBY_LAST_COMMIT_TITLE
fputs("last_commit=" RUBY_LAST_COMMIT_TITLE, stdout);