From 2abf6a3474e052e1ed1e7828a3c2b64198314379 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Jul 2017 12:31:55 +0000
Subject: * template/exts.mk.tmpl: extract SUBMAKEOPTS from sub exts.mk files
 too.  [Bug #13730]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 template/exts.mk.tmpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'template')

diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
index 6f6b0a61ef..e35c28294e 100644
--- a/template/exts.mk.tmpl
+++ b/template/exts.mk.tmpl
@@ -20,7 +20,7 @@ contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/
 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
 <%=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:
 
-- 
cgit v1.2.3