1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in

Browse Source 
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
This commit is contained in:
knu 2004-07-13 06:54:01 +00:00
parent b34c210128
commit db850b21fd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Tue Jul 13 00:50:48 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files. * lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.

5
lib/mkmf.rb
View File

@ -690,7 +690,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
ldirs.concat(defaults.collect {|dir| dir + "/lib"}) ldirs.concat(defaults.collect {|dir| dir + "/lib"})
ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
end end
$LIBPATH |= ldirs $LIBPATH = ldirs | $LIBPATH
[idir, ldir] [idir, ldir]
end end
@ -1022,8 +1022,7 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = "" $LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
$LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"] $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$LIBPATH.unshift("$(topdir)") if $extmk or CROSS_COMPILING
$INSTALLFILES = nil $INSTALLFILES = nil
$objs = nil $objs = nil