diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-09 03:28:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-09 03:28:22 +0000 |
| commit | 7aa4cb1f0670ff02767dfda8b0dd7fb4accb170f (patch) | |
| tree | 1747cf8d3cfc5767c3563ce7fc87e7d846bdfc52 | |
| parent | e3ab724e00c6bfecdd7306b3a78044a5975cefa3 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 7 insertions, 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> * lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises diff --git a/lib/mkmf.rb b/lib/mkmf.rb index df518c193d..4ae477ff48 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -797,12 +797,12 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $LIBPATH = $extmk ? ["$(topdir)"] : [] + $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"] + $LIBPATH.unshift("$(topdir)") if $extmk $objs = nil $libs = "" 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'] end |