1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb (extmake): compact $extlibs.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-08-12 07:55:14 +00:00
parent d43d26f252
commit cc4f2f8fcb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,10 +1,12 @@
Tue Aug 12 11:12:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 12 16:55:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in: static link libraries to LIBRUBY_SO with static linked * Makefile.in: static link libraries to LIBRUBY_SO with static linked
ext. [ruby-dev:21157] ext. [ruby-dev:21157]
* ext/extmk.rb (extmake): sort extension library initialization order. * ext/extmk.rb (extmake): sort extension library initialization order.
* ext/extmk.rb (extmake): compact $extlibs.
Tue Aug 12 02:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Aug 12 02:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the * eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the

11
ext/extmk.rb
View File

@ -101,12 +101,11 @@ def extmake(target)
end end
if $static if $static
$extflags ||= "" $extflags ||= ""
$extlibs ||= "" $extlibs ||= []
$extpath ||= [] $extpath ||= []
$extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty? $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
$extflags += " " + $LDFLAGS unless $LDFLAGS.empty? $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
libs = ($libs.split+$LOCAL_LIBS.split).uniq $extlibs |= $libs.split | $LOCAL_LIBS.split
$extlibs = [$extlibs, *libs].join(" ") unless libs.empty?
$extpath |= $LIBPATH $extpath |= $LIBPATH
end end
ensure ensure
@ -254,13 +253,13 @@ SRC
$extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
if RUBY_PLATFORM =~ /m68k-human|beos/ if RUBY_PLATFORM =~ /m68k-human|beos/
$extlibs.gsub!("-L/usr/local/lib", "") if $extlibs $extflags.delete("-L/usr/local/lib")
end end
$extpath.delete("$(topdir)") $extpath.delete("$(topdir)")
$extflags = libpathflag($extpath) << " " << $extflags.strip $extflags = libpathflag($extpath) << " " << $extflags.strip
conf = [ conf = [
['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs], ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
['EXTLIBS', $extlibs], ['EXTLDFLAGS', $extflags] ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
].map {|n, v| ].map {|n, v|
"#{n}=#{v}" if v and !(v = v.strip).empty? "#{n}=#{v}" if v and !(v = v.strip).empty?
}.compact }.compact
@ -270,7 +269,7 @@ SRC
end end
rubies = [] rubies = []
%w[RUBY RUBYW].each {|r| %w[RUBY RUBYW].each {|r|
r = CONFIG[r+"_INSTALL_NAME"] and !r.empty? and rubies << r+EXEEXT config_string(r+"_INSTALL_NAME") {|r| l << r+EXEEXT}
} }
Dir.chdir ".." Dir.chdir ".."