From 26aae7740f27722c9860201850580d3b105e48c6 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 7 Feb 2013 07:21:30 +0000 Subject: 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 --- tool/mkconfig.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 54b91a65a8..e4a925cd51 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 -- cgit v1.2.3