Merge pull request #767 from woodruffw/ruby-macho-enable

Enable ruby-macho by default.
This commit is contained in:
Martin Afanasjew 2016-08-23 11:40:30 +02:00 committed by GitHub
commit cb700b67e2
3 changed files with 2 additions and 3 deletions

View File

@ -909,7 +909,6 @@ module Homebrew
ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_DEVELOPER"] = "1"
ENV["HOMEBREW_SANDBOX"] = "1" ENV["HOMEBREW_SANDBOX"] = "1"
ENV["HOMEBREW_RUBY_MACHO"] = "1"
ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1"
ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150"
ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1" ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1"

View File

@ -1,5 +1,5 @@
class Keg class Keg
if ENV["HOMEBREW_RUBY_MACHO"] if !ENV["HOMEBREW_NO_RUBY_MACHO"]
require "os/mac/ruby_keg" require "os/mac/ruby_keg"
include RubyKeg include RubyKeg
else else

View File

@ -1,7 +1,7 @@
require "os/mac/shared_mach" require "os/mac/shared_mach"
class Pathname class Pathname
if ENV["HOMEBREW_RUBY_MACHO"] if !ENV["HOMEBREW_NO_RUBY_MACHO"]
require "os/mac/ruby_mach" require "os/mac/ruby_mach"
include RubyMachO include RubyMachO
else else