diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-11 23:46:05 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-11 23:46:05 +0000 |
| commit | b0ccac97d049a588f452e915e7183753db6f9453 (patch) | |
| tree | 03df32db3d551d56ee5dff908eeaa8501cd16d47 /test/fiddle | |
| parent | a0e094ae70dbc88272819d9c9e6ce82f80a32b37 (diff) | |
| download | ruby-b0ccac97d049a588f452e915e7183753db6f9453.tar.gz | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/fiddle')
| -rw-r--r-- | test/fiddle/helper.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index 1da3d93819..461f1878a8 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -10,9 +10,6 @@ case RUBY_PLATFORM 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 |