summaryrefslogtreecommitdiff
path: root/tool/mkconfig.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-27 05:46:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-27 05:46:06 +0000
commit07dcd43a0a2752f8403ddd08a321fc8d4baa5385 (patch)
treeb3359ead6a459a57deaa361d570432e28daf36ee /tool/mkconfig.rb
parentfe5554af85bf2e3363a62647d0bb68d4961dfeb9 (diff)
mkconfig.rb: prefer unexpanded values
* tool/mkconfig.rb: prefer configured values than overriding values for RUBY_INSTALL_NAME and RUBY_SO_NAME when expanded results are same. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/mkconfig.rb')
-rwxr-xr-xtool/mkconfig.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 07076d4..e68b288 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -42,6 +42,8 @@ v_others = []
vars = {}
continued_name = nil
continued_line = nil
+install_name = nil
+so_name = nil
File.foreach "config.status" do |line|
next if /^#/ =~ line
name = nil
@@ -75,8 +77,8 @@ File.foreach "config.status" do |line|
when /^(?:X|(?:MINI|RUN|BASE)RUBY$)/; next
when /^(?:MAJOR|MINOR|TEENY)$/; next
when /^LIBRUBY_D?LD/; next
- when /^RUBY_INSTALL_NAME$/; next if $install_name
- when /^RUBY_SO_NAME$/; next if $so_name
+ when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name
+ when /^RUBY_SO_NAME$/; next vars[name] = (so_name = val).dup if $so_name
when /^arch$/; if val.empty? then val = arch else arch = val end
when /^sitearch$/; val = '$(arch)' if val.empty?
end
@@ -215,10 +217,16 @@ end
v_others.compact!
if $install_name
+ if install_name and vars.expand("$(RUBY_INSTALL_NAME)") == $install_name
+ $install_name = install_name
+ end
v_fast << " CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
v_fast << " CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
end
if $so_name
+ if so_name and vars.expand("$(RUBY_SO_NAME)") == $so_name
+ $so_name = so_name
+ end
v_fast << " CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
end