diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-13 06:54:01 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-13 06:54:01 +0000 |
| commit | 806d0c7a87451d2a43690336ef90c88b85058fcd (patch) | |
| tree | 139eb4fd2746cea63f87170a2eb02cd6c5ffb88d | |
| parent | 864437ff314861dc0e4c725e5dcdf0c89730e176 (diff) | |
| download | ruby-806d0c7a87451d2a43690336ef90c88b85058fcd.tar.gz ruby-806d0c7a87451d2a43690336ef90c88b85058fcd.tar.xz ruby-806d0c7a87451d2a43690336ef90c88b85058fcd.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@6619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -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 2dae28162..e05bf733b 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 |