diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-08 12:31:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-08 12:31:55 +0000 |
| commit | 2abf6a3474e052e1ed1e7828a3c2b64198314379 (patch) | |
| tree | f86551bd096192b8e9c66b678d88a83eee8c144f | |
| parent | 1d6c1d20fdb3372433987bb5d9ce79362c8504bd (diff) | |
* 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
| -rw-r--r-- | template/exts.mk.tmpl | 7 |
1 files changed, 1 insertions, 6 deletions
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: |