diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-15 23:27:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-15 23:27:12 +0000 |
| commit | ffab3e482790f10749581f5ebbc0a13519ca15ca (patch) | |
| tree | 4398f62ece0833719e2d67472cb6582b324d25c8 | |
| parent | 996862fcdf40ef7b43262d697077b5c96b75275d (diff) | |
| download | ruby-ffab3e482790f10749581f5ebbc0a13519ca15ca.tar.gz ruby-ffab3e482790f10749581f5ebbc0a13519ca15ca.tar.xz ruby-ffab3e482790f10749581f5ebbc0a13519ca15ca.zip | |
* ext/extmk.rb: skip linking when libraries to be preloaded not
compiled. [ruby-list:39561]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Apr 16 08:27:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: skip linking when libraries to be preloaded not + compiled. [ruby-list:39561] + Thu Apr 15 23:21:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * process.c (pst_success_p): new method Process::Status#success?. diff --git a/ext/extmk.rb b/ext/extmk.rb index 0c42b7960..ec7ae3234 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -233,10 +233,13 @@ if $extlist.size > 0 $extinit ||= "" $extobjs ||= "" list = $extlist.dup - until list.empty? - s,t,i,r = list.shift - if r and list.any? {|l| r.include?(l[1])} - list << [s,t,i] + while e = list.shift + s,t,i,r = e + if r and !r.empty? + l = list.size + if (while l > 0; break true if r.include?(list[l-=1][1]) end) + list.insert(l + 1, e) + end next end f = format("%s/%s.%s", s, i, $LIBEXT) |