Revert "Merge pull request #7289 from Homebrew/revert-7279-argv-cleanup-18"

This reverts commit 64fd839c955b3c32855067d26fed7daf65183877, reversing
changes made to 6f50801b37b7d829afc37da76d2ef0a1ac1c9f5f.

Library/Homebrew/cli/args.rb

@@ -158,6 +158,14 @@ module Homebrew
         !(HEAD? || devel?)
       end
 
+      # Whether a given formula should be built from source during the current
+      # installation run.
+      def build_formula_from_source?(f)
+        return false if !build_from_source && !build_bottle
+
+        formulae.any? { |args_f| args_f.full_name == f.full_name }
+      end
+
       private
 
       def downcased_unique_named

Library/Homebrew/extend/ARGV.rb

@@ -40,18 +40,6 @@ module HomebrewArgvExtension
     arch&.to_sym
   end
 
-  def build_from_source?
-    switch?("s") || include?("--build-from-source")
-  end
-
-  # Whether a given formula should be built from source during the current
-  # installation run.
-  def build_formula_from_source?(f)
-    return false if !build_from_source? && !build_bottle?
-
-    formulae.any? { |argv_f| argv_f.full_name == f.full_name }
-  end
-
   def force_bottle?
     include?("--force-bottle")
   end

Library/Homebrew/fetch.rb

@@ -7,7 +7,7 @@ module Homebrew
     def fetch_bottle?(f)
       return true if ARGV.force_bottle? && f.bottle
       return false unless f.bottle && f.pour_bottle?
-      return false if ARGV.build_formula_from_source?(f)
+      return false if Homebrew.args.build_formula_from_source?(f)
       return false unless f.bottle.compatible_cellar?
 
       true

Library/Homebrew/formula_installer.rb

@@ -49,7 +49,7 @@ class FormulaInstaller
     @show_header = false
     @ignore_deps = false
     @only_deps = false
-    @build_from_source = ARGV.build_from_source?
+    @build_from_source = Homebrew.args.build_from_source
     @build_bottle = false
     @force_bottle = ARGV.force_bottle?
     @include_test = ARGV.include?("--include-test")
@@ -97,7 +97,7 @@ class FormulaInstaller
 
     return false if !formula.bottled? && !formula.local_bottle_path
     return true  if force_bottle?
-    return false if build_from_source? || build_bottle? || interactive?
+    return false if Homebrew.args.build_from_source || build_bottle? || interactive?
     return false if ARGV.cc
     return false unless options.empty?
     return false if formula.bottle_disabled?
@@ -128,7 +128,7 @@ class FormulaInstaller
 
   def install_bottle_for?(dep, build)
     return pour_bottle? if dep == formula
-    return false if ARGV.build_formula_from_source?(dep)
+    return false if Homebrew.args.build_formula_from_source?(dep)
     return false unless dep.bottle && dep.pour_bottle?
     return false unless build.used_options.empty?
     return false unless dep.bottle.compatible_cellar?
@@ -591,7 +591,7 @@ class FormulaInstaller
     fi.options                |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
     fi.options                |= inherited_options
     fi.options                &= df.options
-    fi.build_from_source       = ARGV.build_formula_from_source?(df)
+    fi.build_from_source       = Homebrew.args.build_formula_from_source?(df)
     fi.force_bottle            = false
     fi.verbose                 = verbose?
     fi.quiet                   = quiet?