ruby-changes:45236
From: normal <ko1@a...>
Date: Thu, 12 Jan 2017 08:46:11 +0900 (JST)
Subject: [ruby-changes:45236] normal:r57309 (trunk): test/fiddle/helper: remove special case for x86_64-linux
normal 2017-01-12 08:46:05 +0900 (Thu, 12 Jan 2017) New Revision: 57309 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57309 Log: test/fiddle/helper: remove special case for x86_64-linux RUBY_PLATFORM is "x86_64-linux" on a 32-bit (x86) Ruby built and running on a 64-bit Linux kernel. I also have a /lib64 directory nowadays because I just installed multi-arch support in userspace. So, fall back to loading based in the size of a packed "unsigned long" type instead of special-casing. Tested with both x86 and x86_64 userspace on 64-bit Linux kernel, as well as x86 with a 32-bit Linux kernel. Modified files: trunk/test/fiddle/helper.rb Index: test/fiddle/helper.rb =================================================================== --- test/fiddle/helper.rb (revision 57308) +++ test/fiddle/helper.rb (revision 57309) @@ -10,9 +10,6 @@ case RUBY_PLATFORM https://github.com/ruby/ruby/blob/trunk/test/fiddle/helper.rb#L10 when /cygwin/ libc_so = "cygwin1.dll" libm_so = "cygwin1.dll" -when /x86_64-linux/ - libc_so = "/lib64/libc.so.6" - libm_so = "/lib64/libm.so.6" when /linux/ libdir = '/lib' case [0].pack('L!').size -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/