summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:02:09 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:02:09 +0000
commit59429eebd02e27feeb488c62a8ed7035ec8d0441 (patch)
tree7dc737eb29f3c2792998f0cf6e9fdb9c505fe54b /win32
parent1314730548dbaad90be3e4e02d886f75d0130329 (diff)
merges r22777 from trunk into ruby_1_9_1.
-- * win32/Makefile.sub (miniruby.exe): workaround for a failure of mt.exe on Windows 7 beta. [ruby-talk:330284] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub7
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3d4f13024d..e4a0e234c8 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -264,7 +264,7 @@ MKMAIN_CMD = mkmain.bat
!if !defined(WINMAINOBJ)
WINMAINOBJ = winmain.$(OBJEXT)
!endif
-ARCHMINIOBJS = dmydln.$(OBJEXT)
+ARCHMINIOBJS = dmydln.$(OBJEXT) miniruby.res
LIBOBJS = $(MISSING) $(LIBOBJS)
!ifndef COMMON_LIBS
@@ -664,6 +664,9 @@ miniruby$(EXEEXT):
$(LDSHARED_1)
$(LDSHARED_2)
+miniruby.rc:
+ @exit > $@
+
!if "$(PROGRAM)" != ""
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
@@ -716,7 +719,7 @@ clean:
distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
- @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+ @$(RM) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
@-$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
@-$(RMDIRS) $(arch_hdrdir:/=\)\ruby