mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e3ab724e00
commit
7aa4cb1f06
2 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Feb 09 12:28:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
|
* lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
|
||||||
|
compiling.
|
||||||
|
|
||||||
Sun Feb 9 08:34:45 2003 Minero Aoki <aamine@loveruby.net>
|
Sun Feb 9 08:34:45 2003 Minero Aoki <aamine@loveruby.net>
|
||||||
|
|
||||||
* lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
|
* lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
|
||||||
|
|
|
@ -797,12 +797,12 @@ 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 = $extmk ? ["$(topdir)"] : []
|
$LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
|
||||||
|
$LIBPATH.unshift("$(topdir)") if $extmk
|
||||||
|
|
||||||
$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.unshift("$(libdir)") unless $extmk or CROSS_COMPILING
|
|
||||||
$LIBRUBYARG = config['LIBRUBYARG']
|
$LIBRUBYARG = config['LIBRUBYARG']
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue