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

system_config: don’t output std/superenv vars.

Browse Source
This commit is contained in:
Mike McQuaid 2018-04-02 09:29:14 +01:00
parent 7095738d1d
commit 9b1bd5f45a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ module Stdenv
def setup_build_environment(formula = nil) def setup_build_environment(formula = nil)
super super
self["HOMEBREW_ENV"] = "std"
PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p } PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p }
# Set the default pkg-config search path, overriding the built-in paths # Set the default pkg-config search path, overriding the built-in paths

1
Library/Homebrew/extend/ENV/super.rb
View File

@ -38,6 +38,7 @@ module Superenv
super super
send(compiler) send(compiler)
self["HOMEBREW_ENV"] = "super"
self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}" self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}"
self["PATH"] = determine_path self["PATH"] = determine_path
self["PKG_CONFIG_PATH"] = determine_pkg_config_path self["PKG_CONFIG_PATH"] = determine_pkg_config_path

14
Library/Homebrew/system_config.rb
View File

@ -151,12 +151,14 @@ class SystemConfig
if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s
f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}" f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}"
end end
ENV.sort.each do |key, value| unless ENV["HOMEBREW_ENV"]
next unless key.start_with?("HOMEBREW_") ENV.sort.each do |key, value|
next if boring_keys.include?(key) next unless key.start_with?("HOMEBREW_")
next if defaults_hash[key.to_sym] next if boring_keys.include?(key)
value = "set" if key =~ /(cookie|key|token|password)/i next if defaults_hash[key.to_sym]
f.puts "#{key}: #{value}" value = "set" if key =~ /(cookie|key|token|password)/i
f.puts "#{key}: #{value}"
end
end end
f.puts hardware if hardware f.puts hardware if hardware
f.puts "Homebrew Ruby: #{describe_homebrew_ruby}" f.puts "Homebrew Ruby: #{describe_homebrew_ruby}"