diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-02 16:54:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-02 16:54:53 +0000 |
| commit | 3cb22b4c0a95e2a183f879424bf4b3527ab61249 (patch) | |
| tree | d480d5e99ca782e7f2fd2f4cdc91d81e68c185e4 | |
| parent | c20d4608f4488ae3ad07624faafa6d1285922088 (diff) | |
| download | ruby-3cb22b4c0a95e2a183f879424bf4b3527ab61249.tar.gz ruby-3cb22b4c0a95e2a183f879424bf4b3527ab61249.tar.xz ruby-3cb22b4c0a95e2a183f879424bf4b3527ab61249.zip | |
* ext/extmk.rb: already built-in libraries satisfy dependencies.
[ruby-dev:24028]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Sep 3 01:54:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: already built-in libraries satisfy dependencies. + [ruby-dev:24028] + Thu Sep 2 11:36:20 2004 WATANABE Hirofumi <eban@ruby-lang.org> * eval.c (rb_obj_instance_eval): backported from HEAD. diff --git a/ext/extmk.rb b/ext/extmk.rb index ec7ae3234..618ef328c 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -233,9 +233,10 @@ if $extlist.size > 0 $extinit ||= "" $extobjs ||= "" list = $extlist.dup + built = [] while e = list.shift s,t,i,r = e - if r and !r.empty? + if r and !(r -= built).empty? l = list.size if (while l > 0; break true if r.include?(list[l-=1][1]) end) list.insert(l + 1, e) @@ -246,6 +247,7 @@ if $extlist.size > 0 if File.exist?(f) $extinit += "\tinit(Init_#{i}, \"#{t}.so\");\n" $extobjs += "ext/#{f} " + built << t end end |