summaryrefslogtreecommitdiff
path: root/cygwin
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-19 08:32:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-19 08:32:16 +0000
commitc6bf047267975d22c0bbf2f2b134b19cf29bbc36 (patch)
tree00eb07e4559a04c56ce43d9de9fc194edc0ba851 /cygwin
parent7f7e809a459e1d5dcdbd053fdf0c22ce84b6b8e4 (diff)
downloadruby-c6bf047267975d22c0bbf2f2b134b19cf29bbc36.tar.gz
Revert r55968 "scriptbin on cygwin"
win32/stub.c only works with malloced argv as win32/win32.c, to realloc it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
-rw-r--r--cygwin/GNUmakefile.in17
1 files changed, 3 insertions, 14 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 5385cfde64..e0d727e303 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -13,6 +13,9 @@ 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)
@@ -29,9 +32,6 @@ 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,17 +116,6 @@ 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::