From 9b1bd5f45ad222acc2ef139b6dec30d243737c6d Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 2 Apr 2018 09:29:14 +0100
Subject: [PATCH] =?UTF-8?q?system=5Fconfig:=20don=E2=80=99t=20output=20std?=
 =?UTF-8?q?/superenv=20vars.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Homebrew/extend/ENV/std.rb   |  2 ++
 Library/Homebrew/extend/ENV/super.rb |  1 +
 Library/Homebrew/system_config.rb    | 14 ++++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 3d082dc837..17e0fd67a0 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -13,6 +13,8 @@ module Stdenv
   def setup_build_environment(formula = nil)
     super
 
+    self["HOMEBREW_ENV"] = "std"
+
     PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p }
 
     # Set the default pkg-config search path, overriding the built-in paths
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 660b9b3a3c..c9fac5b5cd 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -38,6 +38,7 @@ module Superenv
     super
     send(compiler)
 
+    self["HOMEBREW_ENV"] = "super"
     self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}"
     self["PATH"] = determine_path
     self["PKG_CONFIG_PATH"] = determine_pkg_config_path
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 7077bbcfed..1cbd774de6 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -151,12 +151,14 @@ class SystemConfig
       if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s
         f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}"
       end
-      ENV.sort.each do |key, value|
-        next unless key.start_with?("HOMEBREW_")
-        next if boring_keys.include?(key)
-        next if defaults_hash[key.to_sym]
-        value = "set" if key =~ /(cookie|key|token|password)/i
-        f.puts "#{key}: #{value}"
+      unless ENV["HOMEBREW_ENV"]
+        ENV.sort.each do |key, value|
+          next unless key.start_with?("HOMEBREW_")
+          next if boring_keys.include?(key)
+          next if defaults_hash[key.to_sym]
+          value = "set" if key =~ /(cookie|key|token|password)/i
+          f.puts "#{key}: #{value}"
+        end
       end
       f.puts hardware if hardware
       f.puts "Homebrew Ruby: #{describe_homebrew_ruby}"