Merge pull request #7636 from MikeMcQuaid/argv-env

Remove ARGV.env

Library/Homebrew/extend/ARGV.rb

@@ -11,10 +11,6 @@ module HomebrewArgvExtension
     flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
   end
 
-  def env
-    value "env"
-  end
-
   private
 
   def options_only

Library/Homebrew/extend/ENV.rb

@@ -6,7 +6,7 @@ require "extend/ENV/std"
 require "extend/ENV/super"
 
 def superenv?
-  ARGV.env != "std" && Superenv.bin
+  Homebrew.args.env != "std" && Superenv.bin
 end
 
 module EnvActivation

Library/Homebrew/formula_installer.rb

@@ -732,8 +732,8 @@ class FormulaInstaller
     args << "--cc=#{Homebrew.args.cc}" if Homebrew.args.cc
     args << "--keep-tmp" if Homebrew.args.keep_tmp?
 
-    if ARGV.env
-      args << "--env=#{ARGV.env}"
+    if Homebrew.args.env.present?
+      args << "--env=#{Homebrew.args.env}"
     elsif formula.env.std? || formula.deps.select(&:build?).any? { |d| d.name == "scons" }
       args << "--env=std"
     end