diff options
| author | Jack Nagel | 2014-04-04 10:12:09 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-04 10:14:24 -0500 |
| commit | 6784edbe9d8f50764aefb6b17af878490f0456fb (patch) | |
| tree | 91621385f456e0eb1ce926009125112d98307a36 /Library | |
| parent | ee19471c719a0d6fb381831a7cfcbb046732e208 (diff) | |
| download | homebrew-6784edbe9d8f50764aefb6b17af878490f0456fb.tar.bz2 | |
Fix universal option inheritance during upgrades
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index a84827a55..8c685d88c 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -323,11 +323,11 @@ class FormulaInstaller end def inherited_options_for(dep) - options = Options.new - if f.build.universal? && !dep.build? && dep.to_formula.build.has_option?("universal") - options << Option.new("universal") + inherited_options = Options.new + if options.include?("universal") && !dep.build? && dep.to_formula.build.has_option?("universal") + inherited_options << Option.new("universal") end - options + inherited_options end def install_dependencies(deps) |
