From 059f590ff301e8ee11a9f209277aa91d41848eb9 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 19 Aug 2016 08:01:20 +0000 Subject: scriptbin on cygwin * cygwin/GNUmakefile.in (scriptbin): enable on cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cygwin/GNUmakefile.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'cygwin') diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index e0d727e303..5385cfde64 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -13,9 +13,6 @@ else DLL_BASE_NAME := $(RUBY_SO_NAME) DLLWRAP += -mno-cygwin VPATH := $(VPATH):$(srcdir)/win32 - STUBPROGRAM = rubystub$(EXEEXT) - IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# - SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))) endif ifneq ($(ENABLE_SHARED),yes) @@ -32,6 +29,9 @@ else endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) +STUBPROGRAM = rubystub$(EXEEXT) +IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# +SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))) -include uncommon.mk @@ -116,6 +116,17 @@ ifeq (@target_os@,cygwin) cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF) $(ECHO) generating $@ $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@ + +win32/stub.@OBJEXT@: $(TIMESTAMPDIR)/.win32.time + +$(TIMESTAMPDIR)/.win32.time: + $(Q) $(MAKEDIRS) win32 $(@D) + @exit > $@ + +clean-platform: clean-win32 +clean-win32: + $(Q) $(RM) $(TIMESTAMPDIR)/.win32.time + -$(Q) $(RMDIR) win32 2> $(NULL) || exit 0 endif clean-local:: -- cgit v1.2.3