From 6c70fede0c1fce37f7586d959b853df2bdbfff5f Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 Aug 2018 05:02:35 +0000 Subject: version.c: separate Init_ruby_description * version.c (Init_ruby_description): separate to initialize RUBY_DESCRIPTION constant according to mjit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'version.c') diff --git a/version.c b/version.c index c5b70b13a7..fc7105f416 100644 --- a/version.c +++ b/version.c @@ -33,7 +33,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_jit[] = RUBY_DESCRIPTION_WITH(" +JIT"); +static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT"); const char ruby_copyright[] = RUBY_COPYRIGHT; const char ruby_engine[] = "ruby"; @@ -66,11 +66,6 @@ Init_version(void) * The SVN revision for this ruby. */ rb_define_global_const("RUBY_REVISION", MKINT(revision)); - /* - * The full ruby version string, like ruby -v prints' - * This might be overwritten by mjit_init(). - */ - rb_define_global_const("RUBY_DESCRIPTION", MKSTR(description)); /* * The copyright string for ruby */ @@ -86,6 +81,23 @@ Init_version(void) rb_define_global_const("RUBY_ENGINE_VERSION", (1 ? version : MKSTR(version))); } +void +Init_ruby_description(void) +{ + VALUE description; + + if (mjit_opts.on) { + description = MKSTR(description_with_jit); + } + else { + description = MKSTR(description); + } + /* + * The full ruby version string, like ruby -v prints + */ + rb_define_global_const("RUBY_DESCRIPTION", description); +} + /*! Prints the version information of the CRuby interpreter to stdout. */ void ruby_show_version(void) -- cgit v1.2.3