From cc4f2f8fcb6cdc7175eaa65242ebe87285c154c9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Aug 2003 07:55:14 +0000
Subject: * ext/extmk.rb (extmake): compact $extlibs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/extmk.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ext')

diff --git a/ext/extmk.rb b/ext/extmk.rb
index b5286980a7..ae5a338961 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -101,12 +101,11 @@ def extmake(target)
     end
     if $static
       $extflags ||= ""
-      $extlibs ||= ""
+      $extlibs ||= []
       $extpath ||= []
       $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
       $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
-      libs = ($libs.split+$LOCAL_LIBS.split).uniq
-      $extlibs = [$extlibs, *libs].join(" ") unless libs.empty?
+      $extlibs |= $libs.split | $LOCAL_LIBS.split
       $extpath |= $LIBPATH
     end
   ensure
@@ -254,13 +253,13 @@ SRC
 
   $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
   if RUBY_PLATFORM =~ /m68k-human|beos/
-    $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
+    $extflags.delete("-L/usr/local/lib")
   end
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
     ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
-    ['EXTLIBS', $extlibs], ['EXTLDFLAGS', $extflags]
+    ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
   }.compact
@@ -270,7 +269,7 @@ SRC
 end
 rubies = []
 %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 ".."
-- 
cgit v1.2.3