From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from 80x24.org (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E2C2D20798 for ; Wed, 11 Jan 2017 23:14:09 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH] test/fiddle/helper: remove special case for x86_64-linux Date: Wed, 11 Jan 2017 23:14:09 +0000 Message-Id: <20170111231409.5569-1-e@80x24.org> List-Id: RUBY_PLATFORM is "x86_64-linux" for me, despite using a 32-bit (x86) Ruby on a 64-bit Linux kernel. I also have a /lib64 directory because I have multi-arch support in userspace. So, fall back to loading based in the size of a packed "unsigned long" type. --- test/fiddle/helper.rb | 3 --- 1 file changed, 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 @@ 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 -- EW