diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-24 02:58:41 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-24 02:58:41 +0000 |
| commit | b81538d2592f24ae9927ead4fb4909cc74ada570 (patch) | |
| tree | d5cf3fef85fe15d9726b3284d3bad4adf1d83755 | |
| parent | 22acbed6624e088543e8ceae3a1112ab08c69a16 (diff) | |
| download | ruby-b81538d2592f24ae9927ead4fb4909cc74ada570.tar.gz | |
Judge ERB version not RUBY_VERSION but ERB.version
On cross compilation, ruby command uses fake RUBY_VERSION.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rwxr-xr-x | enc/make_encmake.rb | 4 | ||||
| -rw-r--r-- | tool/transcode-tblgen.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index 06979dbad7..dc4b5ef6b2 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -121,7 +121,7 @@ ENCS, ENC_DEPS = target_encodings ATRANS, TRANS = target_transcoders if File.exist?(depend = File.join($srcdir, "depend")) - if RUBY_VERSION >= '2.6' + if ERB.version[/\d+\.\d+/] >= '2.2' erb = ERB.new(File.read(depend), trim_mode: '%') else erb = ERB.new(File.read(depend), nil, '%') @@ -139,7 +139,7 @@ open(ARGV[0], 'wb') {|f| } if MODULE_TYPE == :static filename = "encinit.c.erb" - if RUBY_VERSION >= '2.6' + if ERB.version[/\d+\.\d+/] >= '2.2' erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') else erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-') diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 6a896ad392..4e829314b2 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -1078,7 +1078,7 @@ if __FILE__ == $0 end libs1 = $".dup - if RUBY_VERSION >= '2.6' + if ERB.version[/\d+\.\d+/] >= '2.2' erb = ERB.new(src, trim_mode: '%') else erb = ERB.new(src, nil, '%') |