diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 17 |
2 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Dec 16 21:46:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to + override embedded ARCH_FLAG value on universal-darwin. + Thu Dec 16 19:50:12 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX, diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 160b6e5afe..243ffa12c4 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -36,6 +36,7 @@ module RbConfig arch = RUBY_PLATFORM win32 = /mswin/ =~ arch +universal = /universal.*darwin/ =~ arch v_fast = [] v_others = [] vars = {} @@ -115,8 +116,17 @@ File.foreach "config.status" do |line| val.gsub!(/--with-out-ext/, "--without-ext") end val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump - if /^prefix$/ =~ name + case name + when /^prefix$/ val = "(TOPDIR || DESTDIR + #{val})" + when /^ARCH_FLAG$/ + val = "arch_flag || #{val}" if universal + when /^UNIVERSAL_ARCHNAMES$/ + universal, val = val, 'universal' if universal + when /^arch$/ + if universal + val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}]) + end end v = " CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n"' : '='} #{val}\n" vars[name] = true @@ -138,6 +148,11 @@ drive = File::PATH_SEPARATOR == ';' prefix = "/lib/ruby/#{version}/#{arch}" print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" +print <<'ARCH' if universal + 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 +print " universal = #{universal}\n" print " CONFIG = {}\n" print " CONFIG[\"DESTDIR\"] = DESTDIR\n" |