diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 06:36:54 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 06:36:54 +0000 |
commit | e04b5d25be58ceb85015a8cdda9be05c7fc9b482 (patch) | |
tree | 7c99bbb7bc808853e0637aa1c4a17106558886cf /tool | |
parent | c4b980ec687651abca2a117088615d47416beb53 (diff) |
merge revision(s) 49740:
* tool/merger.rb: support 2.1+ versioning scheme.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/mkconfig.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 3da57581ee..30a259db69 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -29,7 +29,7 @@ print %[ # changes made to this file will be lost the next time ruby is built. module RbConfig - RUBY_VERSION == "#{version}" or + RUBY_VERSION.start_with?("#{version}"[/^[0-9]+[.][0-9]+[.]/]) or raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})" ] |