* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
  the case rpath is disabled.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-03 03:35:11 +00:00
Родитель a7a0b3ad52
Коммит bb2551b41c
2 изменённых файлов: 23 добавлений и 3 удалений

Просмотреть файл

@ -1,3 +1,13 @@
Sun Mar 3 12:35:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
the case rpath is disabled.
Sun Mar 3 12:34:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
the case rpath is disabled.
Sun Mar 3 12:17:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems/ext/ext_conf_builder.rb

Просмотреть файл

@ -350,6 +350,16 @@ module MakeMakefile
end
end
def libpath_env
if libpathenv = CONFIG["LIBPATHENV"]
pathenv = ENV[libpathenv]
libpath = RbConfig.expand($DEFLIBPATH.join(File::PATH_SEPARATOR))
{libpathenv => [libpath, pathenv].compact.join(File::PATH_SEPARATOR)}
else
{}
end
end
def xsystem command, opts = nil
varpat = /\$\((\w+)\)|\$\{(\w+)\}/
if varpat =~ command
@ -362,12 +372,12 @@ module MakeMakefile
if opts and opts[:werror]
result = nil
Logging.postpone do |log|
result = (system(command) and File.zero?(log.path))
result = (system(libpath_env, command) and File.zero?(log.path))
""
end
result
else
system(command)
system(libpath_env, command)
end
end
end
@ -380,7 +390,7 @@ module MakeMakefile
else
puts "| #{command}"
end
IO.popen(command, *mode, &block)
IO.popen(libpath_env, command, *mode, &block)
end
end