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 /ext | |
| 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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |