From 51bcbca236aa1af540766c85e99d93d33492a2d9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 2 Apr 2015 07:27:12 +0000 Subject: rbconfig.rb: use program version * common.mk, tool/mkconfig.rb: check the running ruby version in rbconfig.rb with the program version, as RUBY_VERSION has never been affected by --with-ruby-version option. [ruby-core:68639] [Bug #11002] * configure.in (LIBRUBY_DLDFLAGS): compatibility_version must be valid version numbers, not an arbitrary string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/mkconfig.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index fc91ddec3f..b37241df61 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -136,7 +136,7 @@ File.foreach "config.status" do |line| v_others << v end case name - when "ruby_version" + when "RUBY_PROGRAM_VERSION" version = val[/\A"(.*)"\z/, 1] end end -- cgit v1.2.3