From e8f80120cf7dd2388e8b415ec0a5e829ce7fe9eb 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/extmk.rb b/ext/extmk.rb index 5d26b43e1..62d1cf75a 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 -- cgit