diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 6150c0dd9f..893ec43a93 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -327,8 +327,7 @@ module Homebrew include_test: args.include_test?, include_test_formulae: args.include_test_formulae, build_from_source: args.build_from_source?, - build_from_source_formulae: args.build_from_source_formulae, - args: args) + build_from_source_formulae: args.build_from_source_formulae) fi.options = build_options.used_options fi.env = args.env fi.force = args.force? diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 669df60645..980ff92b92 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -39,7 +39,7 @@ class FormulaInstaller end attr_reader :formula - attr_accessor :cc, :env, :args, :options, :build_bottle, :bottle_arch, + attr_accessor :cc, :env, :options, :build_bottle, :bottle_arch, :build_from_source_formulae, :include_test_formulae, :installed_as_dependency, :installed_on_request, :link_keg, :other_installers @@ -52,8 +52,7 @@ class FormulaInstaller force_bottle: false, include_test: false, include_test_formulae: [], build_from_source: false, build_from_source_formulae: [], - cc: nil, args: nil) - @args = args + cc: nil) @formula = formula @env = nil @force = false @@ -599,8 +598,7 @@ class FormulaInstaller df = dep.to_formula fi = FormulaInstaller.new(df, force_bottle: false, include_test: include_test_formulae.include?(df.full_name), - build_from_source: build_from_source_formulae.include?(df.full_name), - args: args) + build_from_source: build_from_source_formulae.include?(df.full_name)) fi.force = force? fi.keep_tmp = keep_tmp? @@ -641,8 +639,7 @@ class FormulaInstaller fi = FormulaInstaller.new(df, force_bottle: false, include_test: include_test_formulae.include?(df.full_name), - build_from_source: build_from_source_formulae.include?(df.full_name), - args: args) + build_from_source: build_from_source_formulae.include?(df.full_name)) fi.options |= tab.used_options fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) @@ -780,12 +777,6 @@ class FormulaInstaller args << "--devel" end - formula.options.each do |opt| - name = opt.name[/^([^=]+)=$/, 1] - value = self.args&.value(name) if name - args << "--#{name}=#{value}" if value - end - args end diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index bba654734a..0e9f5ef038 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -25,8 +25,7 @@ module Homebrew fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, build_from_source: args.build_from_source?, - build_from_source_formulae: args.build_from_source_formulae, - args: args) + build_from_source_formulae: args.build_from_source_formulae) fi.options = options fi.force = args.force? fi.keep_tmp = args.keep_tmp? diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 0f590652a8..3a9a211129 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -64,7 +64,7 @@ module Homebrew options &= f.options fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, include_test: args.include_test?, - build_from_source: args.build_from_source?, args: args) + build_from_source: args.build_from_source?) fi.options = options fi.force = args.force? fi.keep_tmp = args.keep_tmp?