From 868ab650eb54e723e4c91a7279b7bfbe424d23e4 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Mon, 5 Nov 2012 14:00:35 +0000 Subject: * cygwin/GNUmakefile.in (uncommon.mk): link *.res.o. EXTOBJES is defined in uncommon.mk. *.res.o setting should be below uncommon.mk. [ruby-core:48858] [Bug #7277] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cygwin/GNUmakefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cygwin') diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 2b0a806c2c..5bd414d786 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -29,13 +29,14 @@ else endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) + +-include uncommon.mk + SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS) 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 RUBYDEF = $(DLL_BASE_NAME).def --include uncommon.mk - ruby: $(PROGRAM) rubyw: $(WPROGRAM) stub: $(STUBPROGRAM) -- cgit v1.2.3