3 files changed, 8 insertions, 18 deletions
diff --git a/Library/Homebrew/extend/os/linux/extend/pathname.rb b/Library/Homebrew/extend/os/linux/extend/pathname.rb
index eb6ea409b..604351da7 100644
--- a/Library/Homebrew/extend/os/linux/extend/pathname.rb
+++ b/Library/Homebrew/extend/os/linux/extend/pathname.rb
@@ -1,19 +1,5 @@
-class Pathname
-  # @private
-  def elf?
-    # See: https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
-    read(4) == "\x7fELF"
-  end
+require "os/linux/elf"
 
-  # @private
-  def dynamic_elf?
-    if which "readelf"
-      popen_read("readelf", "-l", to_path).include?(" DYNAMIC ")
-    elsif which "file"
-      !popen_read("file", "-L", "-b", to_path)[/dynamic|shared/].nil?
-    else
-      raise StandardError, "Neither `readelf` nor `file` is available "\
-        "to determine whether '#{self}' is dynamically or statically linked."
-    end
-  end
+class Pathname
+  prepend ELFShim
 end
diff --git a/Library/Homebrew/extend/os/mac/extend/pathname.rb b/Library/Homebrew/extend/os/mac/extend/pathname.rb
index 5fd59e1e7..4ced5a094 100644
--- a/Library/Homebrew/extend/os/mac/extend/pathname.rb
+++ b/Library/Homebrew/extend/os/mac/extend/pathname.rb
@@ -1,5 +1,5 @@
 require "os/mac/mach"
 
 class Pathname
-  include MachOShim
+  prepend MachOShim
 end
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 82cf10be0..32d57c1c4 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -470,6 +470,10 @@ class Pathname
       end
     }
   end
+
+  def mach_o_bundle?
+    false
+  end
 end
 
 require "extend/os/pathname"