diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 02:27:20 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 02:27:20 +0000 |
| commit | a6c117a2b1051c07cb945bb234b584742741303b (patch) | |
| tree | 122323cef0919f2fd4bd5f9ded560e446470b733 /win32 | |
| parent | 9e75b2670227ee1b765f88a6e025f5584faa9844 (diff) | |
* 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/trunk@22777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4dc1ec6de0..0512df4308 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -267,7 +267,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 @@ -675,6 +675,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 \ @@ -725,7 +728,7 @@ clean-local:: 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 |