summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb11
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c4012c2e5..4f1f938b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)