diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index ab87a048bc..7b2a6fa32b 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/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 diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 8b7ca32219..a3a2ecd088 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/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 diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 43d26be9ae..150eaec404 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/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