From 9781dd1bc2b64afb3a8ff73cb875452c845afe3c Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Feb 2007 16:29:24 +0000
Subject: * sorry, commit misstake. reverted.

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

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c4e4c04dae..5d8bf244b3 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -265,7 +265,7 @@ ensure
   log_src(src)
 end
 
-def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
+def link_command(ldflags, opt="", libpath=$LIBPATH)
   Config::expand(TRY_LINK.dup,
                  CONFIG.merge('hdrdir' => $hdrdir.quote,
                               'src' => CONFTEST_C,
@@ -289,7 +289,7 @@ def cpp_command(outfile, opt="")
 		 CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote))
 end
 
-def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
+def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
     (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
   }.join
@@ -1142,7 +1142,7 @@ end
 #
 def create_makefile(target, srcprefix = nil)
   $target = target
-  libpath = $DEFLIBPATH|$LIBPATH
+  libpath = $LIBPATH
   message "creating Makefile\n"
   rm_f "conftest*"
   if CONFIG["DLEXT"] == $OBJEXT
@@ -1204,7 +1204,7 @@ def create_makefile(target, srcprefix = nil)
   mfile = open("Makefile", "wb")
   mfile.print configuration(srcprefix)
   mfile.print "
-libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
+libpath = #{$LIBPATH.join(" ")}
 LIBPATH = #{libpath}
 DEFFILE = #{deffile}
 
@@ -1424,8 +1424,7 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
-  $LIBPATH = []
+  $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
   $INSTALLFILES = nil
 
   $objs = nil
-- 
cgit v1.2.3