diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 12:26:20 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 12:26:20 +0000 |
commit | c15517c9805be02241e4b04889e6375220c8796e (patch) | |
tree | aac4c6ee3ac2c20d2a2650b8fab7ef2652cc8ac1 | |
parent | d391cd577124c36b53997bd35af5bab5e0a072b6 (diff) |
* win32/Makefile.sub (miniruby.exe): merge miss of r27053, too.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu May 20 21:25:55 2010 NAKAMURA Usaku <[email protected]> + + * win32/Makefile.sub (miniruby.exe): merge miss of r27053, too. + Thu May 20 19:10:21 2010 NAKAMURA Usaku <[email protected]> * ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 1750000421..7815895a81 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -584,7 +584,7 @@ s,@top_srcdir@,$(srcdir),;t t miniruby$(EXEEXT): @echo $(LIBS) @$(RM) $@ - $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) -Fe$@ $(LDFLAGS) + $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS) $(LDSHARED_1) $(LDSHARED_2) |