From 2182ce4d16db17d951ac56911c01dfae2c4236fc Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 10 Mar 2014 14:56:02 -0500 Subject: [PATCH] Remove some obsoleted hacks from the installer --- Library/Homebrew/formula_installer.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 600d31f78e..a1f77f52dd 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -247,10 +247,6 @@ class FormulaInstaller end def expand_dependencies(deps) - # FIXME: can't check this inside the block for the top-level dependent - # because it depends on the contents of ARGV. - pour_bottle = pour_bottle? - inherited_options = {} expanded_deps = ARGV.filter_for_dependencies do @@ -260,7 +256,7 @@ class FormulaInstaller if (dep.optional? || dep.recommended?) && build.without?(dep) Dependency.prune - elsif dep.build? && dependent == f && pour_bottle + elsif dep.build? && dependent == f && pour_bottle? Dependency.prune elsif dep.build? && dependent != f && install_bottle?(dependent) Dependency.prune @@ -401,7 +397,7 @@ class FormulaInstaller def build_argv opts = Options.coerce(sanitized_ARGV_options) opts.concat(options) - opts << Option.new("--build-from-source") # don't download bottle + opts end def build