mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
b34c210128
commit
db850b21fd
2 changed files with 10 additions and 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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue