From 9603e39f164bb379118557b9f103aa3cdad349f3 Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Sat, 2 Dec 2017 20:04:03 +0000 Subject: [PATCH] Rename whole build_options block (copypaste from reinstall) --- Library/Homebrew/cmd/upgrade.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 8fa0a9e6ed..9f8763904b 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -119,12 +119,13 @@ module Homebrew tab = Tab.for_keg(keg) end - new_build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options) + build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options) + options = build_options.used_options + options |= f.build.used_options + options &= f.options fi = FormulaInstaller.new(f) - fi.options = new_build_options.used_options - fi.options |= f.build.used_options - fi.options &= f.options + fi.options = options fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.installed_on_request = !ARGV.named.empty? fi.link_keg = keg_was_linked if keg_had_linked_opt