ruby-changes:11194
From: akr <ko1@a...>
Date: Sat, 7 Mar 2009 12:10:50 +0900 (JST)
Subject: [ruby-changes:11194] Ruby:r22802 (trunk): don't exit even if libc/libm is not found.
akr 2009-03-07 12:10:44 +0900 (Sat, 07 Mar 2009) New Revision: 22802 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22802 Log: don't exit even if libc/libm is not found. check lib[cm].so.6.1 as well on linux. add solaris lib. Modified files: trunk/test/dl/test_base.rb Index: test/dl/test_base.rb =================================================================== --- test/dl/test_base.rb (revision 22801) +++ test/dl/test_base.rb (revision 22802) @@ -18,8 +18,14 @@ # 64-bit ruby libdir = '/lib64' if File.directory? '/lib64' end - LIBC_SO = File.join(libdir, "libc.so.6") - LIBM_SO = File.join(libdir, "libm.so.6") + LIBC_SO = [ + 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/ LIBC_SO = "msvcrt.dll" LIBM_SO = "msvcrt.dll" @@ -29,12 +35,14 @@ when /bsd|dragonfly/ LIBC_SO = "/usr/lib/libc.so" LIBM_SO = "/usr/lib/libm.so" +when /solaris2/ + LIBC_SO = "/usr/lib/libc.so" + LIBM_SO = "/usr/lib/libm.so" else LIBC_SO = ARGV[0] LIBM_SO = ARGV[1] if( !(LIBC_SO && LIBM_SO) ) - $stderr.puts("#{$0} <libc> <libm>") - exit + $stderr.puts("libc and libm not found: #{$0} <libc> <libm>") end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/