diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-20 10:07:02 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-20 10:07:02 +0000 |
| commit | e8f80120cf7dd2388e8b415ec0a5e829ce7fe9eb (patch) | |
| tree | d69297bf20cba659c46110aaefb257e5810bb202 /win32 | |
| parent | 9e771f28973be01a29dd3a865c97b953520a822d (diff) | |
| download | ruby-e8f80120cf7dd2388e8b415ec0a5e829ce7fe9eb.tar.gz ruby-e8f80120cf7dd2388e8b415ec0a5e829ce7fe9eb.tar.xz ruby-e8f80120cf7dd2388e8b415ec0a5e829ce7fe9eb.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5174b96fd..d6aafcd73 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) |