summaryrefslogtreecommitdiff
path: root/tool/mkconfig.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-25 06:35:47 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-25 06:35:47 +0000
commit7d248667462c240257e0e9ddaf25f372532660d1 (patch)
treecde2b7df169206f5ebf00468a9a7052c5399dea9 /tool/mkconfig.rb
parent7b65fb292af0ae16ef42ff174eb52e7e0d07a839 (diff)
* tool/merger.rb: support 2.1+ versioning scheme.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/mkconfig.rb')
-rwxr-xr-xtool/mkconfig.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index e874b3f..7586fe6 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})"
]