diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:19:25 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:19:25 +0000 |
| commit | 772640a207589ae7f5397a9019f2e15f1338083d (patch) | |
| tree | 30f24e5550c8ff835ef0f7ccd729e730a088391d /lib | |
| parent | 62f6e9242c620a9d1423010c2c93acbf97cfcd68 (diff) | |
merge revision(s) 37153: [Backport #6207]
* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
default library path. [ruby-core:43726] [Bug #6207]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d683599e50..9adaafc065 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1526,7 +1526,7 @@ def dir_config(target, idefault=nil, ldefault=nil) idir = with_config(target + "-include", idefault) $arg_config.last[1] ||= "${#{target}-dir}/include" ldir = with_config(target + "-lib", ldefault) - $arg_config.last[1] ||= "${#{target}-dir}/lib" + $arg_config.last[1] ||= "${#{target}-dir}/#{@libdir_basename}" idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : [] if defaults @@ -1543,7 +1543,7 @@ def dir_config(target, idefault=nil, ldefault=nil) ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : [] if defaults - ldirs.concat(defaults.collect {|d| d + "/lib"}) + ldirs.concat(defaults.collect {|d| "#{d}/#{@libdir_basename}"}) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR) end $LIBPATH = ldirs | $LIBPATH @@ -2186,6 +2186,8 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG) $extout ||= nil $extout_prefix ||= nil + @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib" + $arg_config.clear dir_config("opt") end |