[前][次][番号順一覧][スレッド一覧]

ruby-changes:64778

From: Nobuyoshi <ko1@a...>
Date: Thu, 7 Jan 2021 15:30:31 +0900 (JST)
Subject: [ruby-changes:64778] 96ce1d9a0f (master): rbconfig.rb: extract cpu from RUBY_PLATFORM when universal

https://git.ruby-lang.org/ruby.git/commit/?id=96ce1d9a0f

From 96ce1d9a0ff64494753ad4730f36a0cd7e7a89e7 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 7 Jan 2021 14:55:33 +0900
Subject: rbconfig.rb: extract cpu from RUBY_PLATFORM when universal


diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index c4f9d5b..fbe4893 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -121,7 +121,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L121
       universal, val = val, 'universal' if universal
     when /^arch$/
       if universal
-        val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
+        val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || RUBY_PLATFORM[/\A[^-]*/]}])
       end
     when /^oldincludedir$/
       val = '"$(SDKROOT)"'+val if /darwin/ =~ arch
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]