1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't exit even if libc/libm is not found.

Browse Source 
check lib[cm].so.6.1 as well on linux.
add solaris lib.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-03-07 03:10:44 +00:00
parent 42d25de958
commit dd76b8b8b1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/dl/test_base.rb
View File

@ -18,8 +18,14 @@ when /linux/
# 64-bit ruby # 64-bit ruby
libdir = '/lib64' if File.directory? '/lib64' libdir = '/lib64' if File.directory? '/lib64'
end end
LIBC_SO = File.join(libdir, "libc.so.6") LIBC_SO = [
LIBM_SO = File.join(libdir, "libm.so.6") File.join(libdir, "libc.so.6"),
File.join(libdir, "libc.so.6.1")
].find {|f| File.file? f }
LIBM_SO = [
File.join(libdir, "libm.so.6"),
File.join(libdir, "libm.so.6.1")
].find {|f| File.file? f }
when /mingw/, /mswin32/ when /mingw/, /mswin32/
LIBC_SO = "msvcrt.dll" LIBC_SO = "msvcrt.dll"
LIBM_SO = "msvcrt.dll" LIBM_SO = "msvcrt.dll"
@ -29,12 +35,14 @@ when /darwin/
when /bsd|dragonfly/ when /bsd|dragonfly/
LIBC_SO = "/usr/lib/libc.so" LIBC_SO = "/usr/lib/libc.so"
LIBM_SO = "/usr/lib/libm.so" LIBM_SO = "/usr/lib/libm.so"
when /solaris2/
LIBC_SO = "/usr/lib/libc.so"
LIBM_SO = "/usr/lib/libm.so"
else else
LIBC_SO = ARGV[0] LIBC_SO = ARGV[0]
LIBM_SO = ARGV[1] LIBM_SO = ARGV[1]
if( !(LIBC_SO && LIBM_SO) ) if( !(LIBC_SO && LIBM_SO) )
$stderr.puts("#{$0} <libc> <libm>") $stderr.puts("libc and libm not found: #{$0} <libc> <libm>")
exit
end end
end end