From b58a30e1c14e971adba4096104274d5d692492e9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 20 Apr 2017 08:13:16 +0000
Subject: extmk.rb: fail for mandatory libraries

* ext/extmk.rb: fail if a mandatory extension library failed to
  configure.  [ruby-core:80759] [Feature #13302]

* template/exts.mk.tmpl: move `exit` at the end.

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

(limited to 'template/exts.mk.tmpl')

diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
index 4d7dc0f2a5..1b2308c4f0 100644
--- a/template/exts.mk.tmpl
+++ b/template/exts.mk.tmpl
@@ -50,8 +50,10 @@ Dir.glob("{ext,gems}/*/exts.mk") do |e|
   end
   s.scan(%r"^note:\n((?:\t.+\n)+)") do |(n)|
     n = n.split(/^/)
+    e = (note.pop if /@exit/ =~ note[-1])
     note.pop if n[-1] == note[-1]
     note |= n
+    note << e if e
   end
 end
 deps.uniq!
@@ -116,7 +118,9 @@ clean:
 distclean:
 	-$(Q)$(RM) ext/extinit.c
 
-<%= deps.join("\n") %>
+% deps.each do |d|
+<%= d %>
+% end
 
 % rubies.each do |ruby|
 <%= ruby %>:
-- 
cgit v1.2.3