diff options
| author | Martin Afanasjew | 2016-08-23 11:40:30 +0200 |
|---|---|---|
| committer | GitHub | 2016-08-23 11:40:30 +0200 |
| commit | cb700b67e2a935feb19464afb9d23b2fc4b11c4e (patch) | |
| tree | 84e0a57977c1e6d1c691193a805ff4691d959778 | |
| parent | 4108c00bf2105e2aac4791f220bd5dfb6e91489f (diff) | |
| parent | f0efaac5aa68e675c687cd413147dd0cf2c68edc (diff) | |
| download | brew-cb700b67e2a935feb19464afb9d23b2fc4b11c4e.tar.bz2 | |
Merge pull request #767 from woodruffw/ruby-macho-enable
Enable ruby-macho by default.
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/keg.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/pathname.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index f55821e88..986e1fd41 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -909,7 +909,6 @@ module Homebrew ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_SANDBOX"] = "1" - ENV["HOMEBREW_RUBY_MACHO"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1" diff --git a/Library/Homebrew/os/mac/keg.rb b/Library/Homebrew/os/mac/keg.rb index dcda0908b..201c57b50 100644 --- a/Library/Homebrew/os/mac/keg.rb +++ b/Library/Homebrew/os/mac/keg.rb @@ -1,5 +1,5 @@ class Keg - if ENV["HOMEBREW_RUBY_MACHO"] + if !ENV["HOMEBREW_NO_RUBY_MACHO"] require "os/mac/ruby_keg" include RubyKeg else diff --git a/Library/Homebrew/os/mac/pathname.rb b/Library/Homebrew/os/mac/pathname.rb index 87fc72936..b76c4333a 100644 --- a/Library/Homebrew/os/mac/pathname.rb +++ b/Library/Homebrew/os/mac/pathname.rb @@ -1,7 +1,7 @@ require "os/mac/shared_mach" class Pathname - if ENV["HOMEBREW_RUBY_MACHO"] + if !ENV["HOMEBREW_NO_RUBY_MACHO"] require "os/mac/ruby_mach" include RubyMachO else |