1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make mkconfig.rb string literals frozen

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-10-09 17:55:49 +09:00
parent 823f29a36e
commit 5eee269866
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-10-09 09:52:35 +00:00 
Merged: https://github.com/ruby/ruby/pull/11846
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/mkconfig.rb
View File

@ -1,4 +1,5 @@
#!./miniruby -s #!./miniruby -s
# frozen-string-literal: true
# This script, which is run when ruby is built, generates rbconfig.rb by # This script, which is run when ruby is built, generates rbconfig.rb by
# parsing information from config.status. rbconfig.rb contains build # parsing information from config.status. rbconfig.rb contains build
@ -169,8 +170,8 @@ def vars.expand(val, config = self)
val.replace(newval) unless newval == val val.replace(newval) unless newval == val
val val
end end
prefix = vars.expand(vars["prefix"] ||= "") prefix = vars.expand(vars["prefix"] ||= +"")
rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") rubyarchdir = vars.expand(vars["rubyarchdir"] ||= +"")
relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
puts %[\ puts %[\
@ -257,14 +258,14 @@ end
v_others.compact! v_others.compact!
if $install_name if $install_name
if install_name and vars.expand("$(RUBY_INSTALL_NAME)") == $install_name if install_name and vars.expand(+"$(RUBY_INSTALL_NAME)") == $install_name
$install_name = install_name $install_name = install_name
end end
v_fast << " CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n" v_fast << " CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
v_fast << " CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n" v_fast << " CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
end end
if $so_name if $so_name
if so_name and vars.expand("$(RUBY_SO_NAME)") == $so_name if so_name and vars.expand(+"$(RUBY_SO_NAME)") == $so_name
$so_name = so_name $so_name = so_name
end end
v_fast << " CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n" v_fast << " CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"