kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/extmk.rb (extmake): shoudn't set $extflags on mswin32.

Browse source 
* 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
This commit is contained in:
usa 2005-01-20 10:07:02 +00:00
parent dcd87b140c
commit b95e5aefda
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Thu Jan 20 11:42:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_new4): should propagate taintedness. * string.c (rb_str_new4): should propagate taintedness.

5
ext/extmk.rb
View file

@ -114,8 +114,9 @@ def extmake(target)
$extflags ||= "" $extflags ||= ""
$extlibs ||= [] $extlibs ||= []
$extpath ||= [] $extpath ||= []
$extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty? unless $mswin
$extflags += " " + $LDFLAGS unless $LDFLAGS.empty? $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
end
$extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split) $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
$extpath |= $LIBPATH $extpath |= $LIBPATH
end end

7
win32/Makefile.sub
View file

@ -145,6 +145,7 @@ LIBRUBY = $(RUBY_SO_NAME).lib
LIBRUBYARG = $(LIBRUBY) LIBRUBYARG = $(LIBRUBY)
EXTOBJS = EXTOBJS =
DLDOBJS =
MAINOBJ = main.obj MAINOBJ = main.obj
WINMAINOBJ = winmain.obj WINMAINOBJ = winmain.obj
@ -420,9 +421,9 @@ $(LIBRUBY_A): $(OBJS) dmyext.obj
$(LIBRUBY): $(RUBYDEF) $(LIBRUBY): $(RUBYDEF)
$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res
@echo. $(EXTOBJS) @echo. $(DLDOBJS)
$(LIBRUBY_LDSHARED) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ $(LIBRUBY_LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
-Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS) -Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS)
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)