admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7636 from MikeMcQuaid/argv-env

Browse Source 
Remove ARGV.env
This commit is contained in:
Mike McQuaid 2020-05-23 14:37:24 +01:00 committed by GitHub
commit cd4d3b988e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ARGV.rb
View File

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

2
Library/Homebrew/extend/ENV.rb
View File

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

4
Library/Homebrew/formula_installer.rb
View File

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