Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ARGV.env #7636

Merged
merged 2 commits into from May 23, 2020
Merged

Remove ARGV.env #7636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5ff4f5
Remove ARGV.env
MikeMcQuaid May 23, 2020
64602bc
Merge branch 'master' into argv-env
MikeMcQuaid May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions Library/Homebrew/extend/ARGV.rb
View file
Open in desktop
Expand Up @@ -11,10 +11,6 @@ def debug?
flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
end

def env
value "env"
end

private

def options_only
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/extend/ENV.rb
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
require "extend/ENV/super"

def superenv?
ARGV.env != "std" && Superenv.bin
Homebrew.args.env != "std" && Superenv.bin
end

module EnvActivation
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/formula_installer.rb
View file
Open in desktop
Expand Up @@ -732,8 +732,8 @@ def sanitized_argv_options
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
Expand Down