From 3c06d3a6bd2051fb2c321e04291951ae8df127bc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Feb 2017 12:08:56 +0000
Subject: fiddle: jobserver for libffi

* ext/fiddle/depend (libffi): use $(MAKE) explicitly for recursive
  make, so that jobserver works.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/fiddle/depend | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'ext/fiddle/depend')

diff --git a/ext/fiddle/depend b/ext/fiddle/depend
index 470e15efef..7e00a6e429 100644
--- a/ext/fiddle/depend
+++ b/ext/fiddle/depend
@@ -26,22 +26,29 @@ $(LIBFFI_DIR)/Makefile:
 	$(Q) $(CONFIGURE_LIBFFI)
 
 build-libffi: $(LIBFFI_A)
-build-libffi $(LIBFFI_A):
-	$(Q) $(SUBMAKE_LIBFFI)
+$(LIBFFI_A):
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG)
 
+clean-none:
 clean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) clean
+libffi/clean: libffi/clean
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) clean
 
-distclean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) distclean
+distclean-none:
+distclean-libffi: libffi/distclean
+libffi/distclean:
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) distclean
 	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
 	$(Q) $(RUBY) -rfileutils -e "FileUtils.rmdir(Dir.glob(ARGV[0]+'/**/{,.*/}'), :parents=>true)" $(LIBFFI_DIR)
 
-realclean-libffi:
+realclean-none:
+realclean-libffi: libffi/realclean
+libffi/realclean:
 	$(Q) $(RMALL) $(LIBFFI_DIR)
 
 .PHONY: clean-libffi distclean-libffi realclean-libffi
 .PHONY: clean-none distclean-none realclean-none
+.PHONY: libffi/clean libffi/distclean libffi/realclean
 
 clean: clean-$(LIBFFI_CLEAN)
 distclean: distclean-$(LIBFFI_CLEAN)
-- 
cgit v1.2.1