Skip to content

Commit

Permalink
Revert r55968 "scriptbin on cygwin"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
nobu committed Aug 19, 2016
1 parent 7f7e809 commit c6bf047
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
17 changes: 3 additions & 14 deletions cygwin/GNUmakefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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::
Expand Down
1 change: 0 additions & 1 deletion win32/stub.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <ruby.h>
#include <windows.h>
static void stub_sysinit(int *argc, char ***argv);
#define ruby_sysinit stub_sysinit
#include <main.c>
Expand Down

0 comments on commit c6bf047

Please sign in to comment.