ruby-changes:47173
From: nobu <ko1@a...>
Date: Sat, 8 Jul 2017 21:31:59 +0900 (JST)
Subject: [ruby-changes:47173] nobu:r59288 (trunk): * template/exts.mk.tmpl: extract SUBMAKEOPTS from sub exts.mk files too. [Bug #13730]
nobu 2017-07-08 21:31:55 +0900 (Sat, 08 Jul 2017) New Revision: 59288 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59288 Log: * template/exts.mk.tmpl: extract SUBMAKEOPTS from sub exts.mk files too. [Bug #13730] Modified files: trunk/template/exts.mk.tmpl Index: template/exts.mk.tmpl =================================================================== --- template/exts.mk.tmpl (revision 59287) +++ template/exts.mk.tmpl (revision 59288) @@ -20,7 +20,7 @@ contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[ https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L20 Dir.glob("{ext,gems}/*/exts.mk") do |e| gem = /\Agems(?=\/)/ =~ e s = File.read(e) - s.scan(/^(extensions|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| + s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| v.gsub!(/\\\n[ \t]*/, ' ') next if v.empty? next if gem and n != "extensions" @@ -103,11 +103,6 @@ end https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L103 <%=k%> = <%=RbConfig::MAKEFILE_CONFIG[k]%> % end -SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \ - EXTSOLIBS="$(EXTLIBS)" LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) \ - EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \ - UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS= - all: static: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/