summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-13 06:54:01 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-13 06:54:01 +0000
commitdb850b21fd6550f102fb5e7a322774788be96757 (patch)
tree139eb4fd2746cea63f87170a2eb02cd6c5ffb88d
parentb34c2101280e34cff949e1999711542d2f069660 (diff)
* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
extmk mode. * lib/mkmf.rb (dir_config): Prepend a new library path instead of appending so it is tried first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--lib/mkmf.rb5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 40d128786e..fafaa35dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul 13 15:48:56 2004 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
+ extmk mode.
+
+ * lib/mkmf.rb (dir_config): Prepend a new library path instead of
+ appending so it is tried first.
+
Tue Jul 13 00:50:48 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2dae281623..e05bf733b8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -690,7 +690,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
ldirs.concat(defaults.collect {|dir| dir + "/lib"})
ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
end
- $LIBPATH |= ldirs
+ $LIBPATH = ldirs | $LIBPATH
[idir, ldir]
end
@@ -1022,8 +1022,7 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
- $LIBPATH.unshift("$(topdir)") if $extmk or CROSS_COMPILING
+ $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$INSTALLFILES = nil
$objs = nil