diff options
| author | Jack Nagel | 2014-03-10 14:56:02 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-10 14:56:02 -0500 |
| commit | 2182ce4d16db17d951ac56911c01dfae2c4236fc (patch) | |
| tree | 311e78da8289cf5fb5497e5a415f475ccc15776a /Library/Homebrew | |
| parent | 9bc8d0820ea0d287e1ecd784509a058730fc31ee (diff) | |
| download | brew-2182ce4d16db17d951ac56911c01dfae2c4236fc.tar.bz2 | |
Remove some obsoleted hacks from the installer
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 600d31f78..a1f77f52d 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 |