summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-21 07:44:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-21 07:44:24 +0000
commitf3e0252e5e51c8e47c7ad4f8d2b6235f3d5ee7af (patch)
tree30d99152ffeedb2bc6e8ce980f181fda6678665f
parentb89f4520e502e4e100c3d56216305eaf870243b6 (diff)
* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
[ruby-dev:22652] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b724e05c8c..31a008d28f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 21 16:44:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (merge_libs): squeeze successive same libraries.
+ [ruby-dev:22652]
+
Wed Jan 21 16:10:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/base64.rb: enclosed in a module. [ruby-core:02285]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index fb62c271ea..d3076f40d3 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -117,6 +117,7 @@ def merge_libs(*libs)
libs.inject([]) do |x, y|
xy = x & y
xn = yn = 0
+ y = y.inject([]) {|ary, e| ary.last == e ? ary : ary << e}
y.each_with_index do |v, yi|
if xy.include?(v)
xi = [x.index(v), xn].max()