diff options
| author | Jack Nagel | 2014-02-27 14:22:43 -0600 | 
|---|---|---|
| committer | Jack Nagel | 2014-02-27 14:22:43 -0600 | 
| commit | 793d6de6c3211ffea112770081e788e760806366 (patch) | |
| tree | 8c214d403b1230c03bf1b1b19ef5e151a2f229f7 /Library/Homebrew/dependency.rb | |
| parent | 97dd879159a46070b2aff7133fe4dc027265f239 (diff) | |
| download | brew-793d6de6c3211ffea112770081e788e760806366.tar.bz2 | |
Pass expansion-time build options to install_dependency
Diffstat (limited to 'Library/Homebrew/dependency.rb')
| -rw-r--r-- | Library/Homebrew/dependency.rb | 11 | 
1 files changed, 7 insertions, 4 deletions
| diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 8ddeb90fd..02d981b01 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -36,12 +36,15 @@ class Dependency      to_formula.installed?    end -  def satisfied? -    installed? && missing_options.empty? +  def satisfied?(inherited_options) +    installed? && missing_options(inherited_options).empty?    end -  def missing_options -    options - Tab.for_formula(to_formula).used_options - to_formula.build.implicit_options +  def missing_options(inherited_options=[]) +    missing = options | inherited_options +    missing -= Tab.for_formula(to_formula).used_options +    missing -= to_formula.build.implicit_options +    missing    end    def universal! | 
