summaryrefslogtreecommitdiff
path: root/cygwin
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-20 08:40:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-20 08:40:11 +0000
commit3792ad0ecaa7e8dc0f6ac83cb97962eadd23647c (patch)
tree3046ab4ed39dc17c2422554dee77a6690f467024 /cygwin
parent76e8beb6e153b4da1e953d45d2767b1b4c08d478 (diff)
Update cygwin/GNUmakefile.in
* cygwin/GNUmakefile.in: remove -jN option from submake, and include defs/gmake.mk to serialize test targets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
-rw-r--r--cygwin/GNUmakefile.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index ebcc483..900c31a 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,3 +1,4 @@
+override MFLAGS := $(filter-out -j%,$(MFLAGS))
include Makefile
ENABLE_SHARED=@ENABLE_SHARED@
@@ -32,6 +33,8 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-include uncommon.mk
+include $(srcdir)/defs/gmake.mk
+
SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc