From b95e5aefdaa05b19d335772b6b9834c13b024ae6 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 20 Jan 2005 10:07:02 +0000 Subject: * ext/extmk.rb (extmake): shoudn't set $extflags on mswin32. * win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of $EXTOBJS. fixed: [ruby-core:04290] (backported from CVS HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5174b96fd7..d6aafcd73e 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -145,6 +145,7 @@ LIBRUBY = $(RUBY_SO_NAME).lib LIBRUBYARG = $(LIBRUBY) EXTOBJS = +DLDOBJS = MAINOBJ = main.obj WINMAINOBJ = winmain.obj @@ -420,9 +421,9 @@ $(LIBRUBY_A): $(OBJS) dmyext.obj $(LIBRUBY): $(RUBYDEF) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) -$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res - @echo. $(EXTOBJS) - $(LIBRUBY_LDSHARED) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ +$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res + @echo. $(DLDOBJS) + $(LIBRUBY_LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ -Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS) $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) -- cgit v1.2.3