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 | b95e5aefdaa05b19d335772b6b9834c13b024ae6 (patch) | |
| tree | d69297bf20cba659c46110aaefb257e5810bb202 | |
| parent | dcd87b140ccb208b6d73ef35474ce23affa6bc51 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/extmk.rb | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
3 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Thu Jan 20 19:03:24 2005 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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) + Thu Jan 20 11:42:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_new4): should propagate taintedness. diff --git a/ext/extmk.rb b/ext/extmk.rb index 5d26b43e13..62d1cf75af 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -114,8 +114,9 @@ def extmake(target) $extflags ||= "" $extlibs ||= [] $extpath ||= [] - $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty? - $extflags += " " + $LDFLAGS unless $LDFLAGS.empty? + unless $mswin + $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ") + end $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split) $extpath |= $LIBPATH end 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) |