summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-20 06:36:57 (GMT)
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-20 06:36:57 (GMT)
commit0516a3378f03e8563350b8c4fe94ac3f9e9c9f75 (patch)
treea285bd7b3433600fc89f0a17d8b9d4e2b709613b /template
parent0f4978d5335b6e9fc04ff938966905f24688ff25 (diff)
* lib/erb.rb: revert r53123. It break compatibility like thor and rspec-rails.
We should try with Ruby 2.4 or 3.0. [Bug #11842][ruby-core:72374] * lib/rdoc/erb_partial.rb: ditto. * template/verconf.h.tmpl: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
-rw-r--r--template/verconf.h.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
index 9e09b77..9325aee 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
@@ -52,7 +52,7 @@
% R["exec_prefix"] = '"RUBY_EXEC_PREFIX"'
% R["prefix"] = '"RUBY_EXEC_PREFIX"'
% exec_prefix_pat = /\A"#{Regexp.quote(rbconfig::CONFIG['exec_prefix'])}(?=\/|\z)/
-% _erbout = [_erbout.join.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
+% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
% pre, name, repl = $1, $2, $3
% pat = %["#{name}"]
% c = C.merge(R.reject {|key, value| key == name or value.include?(pat)})
@@ -60,4 +60,4 @@
% repl.gsub!(/^""(?!$)|(.)""$/, '\1')
% repl.sub!(exec_prefix_pat, 'RUBY_EXEC_PREFIX"')
% pre + repl
-% }]
+% }