diff options
| author | Mike McQuaid | 2016-11-13 10:50:51 +0000 |
|---|---|---|
| committer | GitHub | 2016-11-13 10:50:51 +0000 |
| commit | 2a53d14b515e17606a0981c3cf98ce41c2712414 (patch) | |
| tree | 00cb6079e51e8ad2905c8f65a83d7d79818ab64e /Library/Homebrew/cmd | |
| parent | b34bd4fa126b80ae6eecbd036dbe6aa65f1b4209 (diff) | |
| parent | 8ebddca0fed4cdbf3c3b8f9da42da2c10e5128c6 (diff) | |
| download | brew-2a53d14b515e17606a0981c3cf98ce41c2712414.tar.bz2 | |
Merge pull request #1217 from MatzFan/invalid_build_option_warnings
Invalid build option warnings - supersedes #1088
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 16639c4aa..c3c3b4bb9 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -249,19 +249,21 @@ module Homebrew def install_formula(f) f.print_tap_action + build_options = f.build fi = FormulaInstaller.new(f) - fi.options = f.build.used_options - fi.ignore_deps = ARGV.ignore_deps? - fi.only_deps = ARGV.only_deps? - fi.build_bottle = ARGV.build_bottle? - fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? - fi.force_bottle = ARGV.force_bottle? - fi.interactive = ARGV.interactive? - fi.git = ARGV.git? - fi.verbose = ARGV.verbose? - fi.quieter = ARGV.quieter? - fi.debug = ARGV.debug? + fi.options = build_options.used_options + fi.invalid_option_names = build_options.invalid_option_names + fi.ignore_deps = ARGV.ignore_deps? + fi.only_deps = ARGV.only_deps? + fi.build_bottle = ARGV.build_bottle? + fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? + fi.force_bottle = ARGV.force_bottle? + fi.interactive = ARGV.interactive? + fi.git = ARGV.git? + fi.verbose = ARGV.verbose? + fi.quieter = ARGV.quieter? + fi.debug = ARGV.debug? fi.prelude fi.install fi.finish |