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

Fix target_cpu at runtime

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-01-25 16:09:40 +09:00
parent 9794e49c88
commit 6422fef90c
Notes: git 2023-01-26 07:31:38 +00:00 
Merged: https://github.com/ruby/ruby/pull/7186
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tool/mkconfig.rb
View File

@ -122,11 +122,11 @@ File.foreach "config.status" do |line|
universal, val = val, 'universal' if universal universal, val = val, 'universal' if universal
when /^arch$/ when /^arch$/
if universal if universal
platform = val.sub(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || RUBY_PLATFORM[/\A[^-]*/]}]) platform = val.sub(/universal/, '$(arch)')
end end
when /^target_cpu$/ when /^target_cpu$/
if universal if universal
val = 'arch' val = 'cpu'
end end
when /^target$/ when /^target$/
val = '"$(target_cpu)-$(target_vendor)-$(target_os)"' val = '"$(target_cpu)-$(target_vendor)-$(target_os)"'
@ -193,11 +193,13 @@ print " # Ruby installed directory.\n"
print " TOPDIR = File.dirname(__FILE__).chomp!(#{relative_archdir.dump})\n" print " TOPDIR = File.dirname(__FILE__).chomp!(#{relative_archdir.dump})\n"
print " # DESTDIR on make install.\n" print " # DESTDIR on make install.\n"
print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
print <<'ARCH' if universal print <<"UNIVERSAL", <<'ARCH' if universal
universal = #{universal}
UNIVERSAL
arch_flag = ENV['ARCHFLAGS'] || ((e = ENV['RC_ARCHS']) && e.split.uniq.map {|a| "-arch #{a}"}.join(' ')) arch_flag = ENV['ARCHFLAGS'] || ((e = ENV['RC_ARCHS']) && e.split.uniq.map {|a| "-arch #{a}"}.join(' '))
arch = arch_flag && arch_flag[/\A\s*-arch\s+(\S+)\s*\z/, 1] arch = arch_flag && arch_flag[/\A\s*-arch\s+(\S+)\s*\z/, 1]
cpu = arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || RUBY_PLATFORM[/\A[^-]*/]
ARCH ARCH
print " universal = #{universal}\n" if universal
print " # The hash configurations stored.\n" print " # The hash configurations stored.\n"
print " CONFIG = {}\n" print " CONFIG = {}\n"
print " CONFIG[\"DESTDIR\"] = DESTDIR\n" print " CONFIG[\"DESTDIR\"] = DESTDIR\n"