diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:09 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:09 +0000 |
| commit | 59429eebd02e27feeb488c62a8ed7035ec8d0441 (patch) | |
| tree | 7dc737eb29f3c2792998f0cf6e9fdb9c505fe54b | |
| parent | 1314730548dbaad90be3e4e02d886f75d0130329 (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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Mar 5 11:27:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (miniruby.exe): workaround for a failure of + mt.exe on Windows 7 beta. [ruby-talk:330284] + Wed Mar 4 21:21:51 2009 Yusuke Endoh <mame@tsg.ne.jp> * lib/thread.rb (SizedQueue#push): fix limit condition. 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 |