From e1bbab6ca6c8f96bb53fee9af3f0c01edd2d2f94 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 7 May 2017 17:28:37 +0100 Subject: Revert "Merge pull request #2603 from MikeMcQuaid/tweak-gem-vendoring" This reverts commit 2372872974d1049c2beafe7dedb7f8f882502058, reversing changes made to 3e4547f52e7ebec633f8bfefc8a396d944edf908. --- Library/Homebrew/os/mac/mach.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Library/Homebrew/os') diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb index 416183f68..71f501fe9 100644 --- a/Library/Homebrew/os/mac/mach.rb +++ b/Library/Homebrew/os/mac/mach.rb @@ -1,11 +1,10 @@ +require "macho" require "os/mac/architecture_list" module MachOShim # @private def macho @macho ||= begin - require "macho" - MachO.open(to_s) end end @@ -13,8 +12,6 @@ module MachOShim # @private def mach_data @mach_data ||= begin - require "macho" - machos = [] mach_data = [] -- cgit v1.2.3 From 57db2e539eaa5fbae351963265312bd24ed08f6b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 7 May 2017 17:28:39 +0100 Subject: Revert "Merge pull request #2597 from MikeMcQuaid/vendor-gems" This reverts commit 3e4547f52e7ebec633f8bfefc8a396d944edf908, reversing changes made to 6edf9382bcc1240ad6f97c8b752cfe56cef9965d. --- Library/Homebrew/os/mac/mach.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library/Homebrew/os') diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb index 71f501fe9..9b53c4979 100644 --- a/Library/Homebrew/os/mac/mach.rb +++ b/Library/Homebrew/os/mac/mach.rb @@ -1,4 +1,4 @@ -require "macho" +require "vendor/macho/macho" require "os/mac/architecture_list" module MachOShim -- cgit v1.2.3