mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
remove adding $(archdir) to $LIBPATH. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b443525215
commit
0e1b92874b
2 changed files with 16 additions and 13 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Dec 15 21:16:44 2002 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
|
||||||
|
remove adding $(archdir) to $LIBPATH.
|
||||||
|
|
||||||
Sat Dec 15 12:15:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
|
Sat Dec 15 12:15:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
|
||||||
|
|
||||||
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
|
||||||
|
|
|
@ -780,16 +780,14 @@ 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 = []
|
$LIBPATH = $extmk ? ["$(topdir)"] : []
|
||||||
|
|
||||||
$objs = nil
|
$objs = nil
|
||||||
$libs = ""
|
$libs = ""
|
||||||
if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
|
if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
|
||||||
$LIBPATH = ["$(topdir)"]
|
|
||||||
$LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING
|
$LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING
|
||||||
$LIBRUBYARG = config['LIBRUBYARG']
|
$LIBRUBYARG = config['LIBRUBYARG']
|
||||||
end
|
end
|
||||||
$LIBPATH << "$(archdir)"
|
|
||||||
|
|
||||||
$LOCAL_LIBS = ""
|
$LOCAL_LIBS = ""
|
||||||
dir_config("opt")
|
dir_config("opt")
|
||||||
|
|
Loading…
Add table
Reference in a new issue