summaryrefslogtreecommitdiff
path: root/tool/mkconfig.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-07 07:21:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-07 07:21:30 +0000
commit26aae7740f27722c9860201850580d3b105e48c6 (patch)
tree688f0f2dcbb775b06519bf21d01e80c3d2e82cac /tool/mkconfig.rb
parent13b11810e289bc7b946e9c6eac7d1348107f0eda (diff)
mkconfig.rb: fix concatenated lines
* tool/mkconfig.rb: see if a variable is set before setting it to fix concatenated lines. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/mkconfig.rb')
-rwxr-xr-xtool/mkconfig.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 54b91a6..e4a925c 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -113,6 +113,7 @@ File.foreach "config.status" do |line|
end
end
end
+ eq = win32 && vars[name] ? '<< "\n"' : '='
vars[name] = val
if name == "configure_args"
val.gsub!(/ +(?!-)/, "=") if win32
@@ -131,7 +132,7 @@ File.foreach "config.status" do |line|
val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
end
end
- v = " CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n"' : '='} #{val}\n"
+ v = " CONFIG[\"#{name}\"] #{eq} #{val}\n"
if fast[name]
v_fast << v
else