From 33f83be10e5256ce628cb128f25d0a9f399d37ef Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 7 May 2017 15:33:54 +0100 Subject: Tweak Gem vendoring. If people have `HOMEBREW_RUBY_PATH` set then things explode in a rather confusing fashion. Instead, run `bundle` for them with the arguments that they'd want. Also, move `macho` requires into the module itself; it's a pain having to do everything for Bundler before requiring `pathname` which is a core Ruby class. --- Library/Homebrew/os/mac/mach.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Library/Homebrew/os/mac') diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb index 71f501fe9..416183f68 100644 --- a/Library/Homebrew/os/mac/mach.rb +++ b/Library/Homebrew/os/mac/mach.rb @@ -1,10 +1,11 @@ -require "macho" require "os/mac/architecture_list" module MachOShim # @private def macho @macho ||= begin + require "macho" + MachO.open(to_s) end end @@ -12,6 +13,8 @@ module MachOShim # @private def mach_data @mach_data ||= begin + require "macho" + machos = [] mach_data = [] -- cgit v1.2.3