Revert ENV changes

Library/Homebrew/extend/ENV/std.rb

@@ -68,6 +68,7 @@ def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_a
     gcc_formula = gcc_version_formula(cc)
     append_path "PATH", gcc_formula.opt_bin.to_s
   end
+  alias generic_setup_build_environment setup_build_environment
 
   sig { returns(T.nilable(PATH)) }
   def determine_pkg_config_libdir

Library/Homebrew/extend/ENV/super.rb

@@ -119,6 +119,7 @@ def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_a
     # These flags will also be present:
     # a - apply fix for apr-1-config path
   end
+  alias generic_setup_build_environment setup_build_environment
 
   private
 

Library/Homebrew/extend/os/linux/extend/ENV/std.rb

@@ -1,45 +1,36 @@
 # typed: true # rubocop:todo Sorbet/StrictSigil
 # frozen_string_literal: true
 
-module OS
-  module Linux
-    module Stdenv
-      extend T::Helpers
-
-      requires_ancestor { ::Stdenv }
-
-      sig {
-        params(
-          formula:         T.nilable(Formula),
-          cc:              T.nilable(String),
-          build_bottle:    T.nilable(T::Boolean),
-          bottle_arch:     T.nilable(String),
-          testing_formula: T::Boolean,
-          debug_symbols:   T.nilable(T::Boolean),
-        ).void
-      }
-      def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil,
-                                  testing_formula: false, debug_symbols: false)
-        super
-
-        prepend_path "CPATH", HOMEBREW_PREFIX/"include"
-        prepend_path "LIBRARY_PATH", HOMEBREW_PREFIX/"lib"
-        prepend_path "LD_RUN_PATH", HOMEBREW_PREFIX/"lib"
-
-        return unless @formula
-
-        prepend_path "CPATH", @formula.include
-        prepend_path "LIBRARY_PATH", @formula.lib
-        prepend_path "LD_RUN_PATH", @formula.lib
-      end
+module Stdenv
+  sig {
+    params(
+      formula:         T.nilable(Formula),
+      cc:              T.nilable(String),
+      build_bottle:    T.nilable(T::Boolean),
+      bottle_arch:     T.nilable(String),
+      testing_formula: T::Boolean,
+      debug_symbols:   T.nilable(T::Boolean),
+    ).void
+  }
+  def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false,
+                              debug_symbols: false)
+    generic_setup_build_environment(formula:, cc:, build_bottle:, bottle_arch:,
+                                    testing_formula:, debug_symbols:)
+
+    prepend_path "CPATH", HOMEBREW_PREFIX/"include"
+    prepend_path "LIBRARY_PATH", HOMEBREW_PREFIX/"lib"
+    prepend_path "LD_RUN_PATH", HOMEBREW_PREFIX/"lib"
+
+    return unless @formula
+
+    prepend_path "CPATH", @formula.include
+    prepend_path "LIBRARY_PATH", @formula.lib
+    prepend_path "LD_RUN_PATH", @formula.lib
+  end
 
-      def libxml2
-        append "CPPFLAGS", "-I#{::Formula["libxml2"].include/"libxml2"}"
-      rescue FormulaUnavailableError
-        nil
-      end
-    end
+  def libxml2
+    append "CPPFLAGS", "-I#{Formula["libxml2"].include/"libxml2"}"
+  rescue FormulaUnavailableError
+    nil
   end
 end
-
-Stdenv.prepend(OS::Linux::Stdenv)

Library/Homebrew/extend/os/linux/extend/ENV/super.rb

@@ -1,82 +1,73 @@
 # typed: true # rubocop:todo Sorbet/StrictSigil
 # frozen_string_literal: true
 
-module OS
-  module Linux
-    module Superenv
-      extend T::Helpers
-
-      requires_ancestor { ::Superenv }
-
-      sig { returns(Pathname) }
-      def self.shims_path
-        HOMEBREW_SHIMS_PATH/"linux/super"
-      end
+module Superenv
+  sig { returns(Pathname) }
+  def self.shims_path
+    HOMEBREW_SHIMS_PATH/"linux/super"
+  end
 
-      sig { returns(T.nilable(Pathname)) }
-      def self.bin
-        shims_path.realpath
-      end
+  sig { returns(T.nilable(Pathname)) }
+  def self.bin
+    shims_path.realpath
+  end
 
-      sig {
-        params(
-          formula:         T.nilable(Formula),
-          cc:              T.nilable(String),
-          build_bottle:    T.nilable(T::Boolean),
-          bottle_arch:     T.nilable(String),
-          testing_formula: T::Boolean,
-          debug_symbols:   T.nilable(T::Boolean),
-        ).void
-      }
-      def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil,
-                                  testing_formula: false, debug_symbols: false)
-        super
-        self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2"
-        self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path
-        self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula)
-        self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| d.name == "libtool" || d.name == "bison" }
-      end
+  sig {
+    params(
+      formula:         T.nilable(Formula),
+      cc:              T.nilable(String),
+      build_bottle:    T.nilable(T::Boolean),
+      bottle_arch:     T.nilable(String),
+      testing_formula: T::Boolean,
+      debug_symbols:   T.nilable(T::Boolean),
+    ).void
+  }
+  def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false,
+                              debug_symbols: false)
+    generic_setup_build_environment(formula:, cc:, build_bottle:, bottle_arch:,
+                                    testing_formula:, debug_symbols:)
+    self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2"
+    self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path
+    self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula)
+    self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| d.name == "libtool" || d.name == "bison" }
+  end
 
-      def homebrew_extra_paths
-        paths = generic_homebrew_extra_paths
-        paths += %w[binutils make].filter_map do |f|
-          bin = Formulary.factory(f).opt_bin
-          bin if bin.directory?
-        rescue FormulaUnavailableError
-          nil
-        end
-        paths
-      end
+  def homebrew_extra_paths
+    paths = generic_homebrew_extra_paths
+    paths += %w[binutils make].filter_map do |f|
+      bin = Formulary.factory(f).opt_bin
+      bin if bin.directory?
+    rescue FormulaUnavailableError
+      nil
+    end
+    paths
+  end
 
-      def homebrew_extra_isystem_paths
-        paths = []
-        # Add paths for GCC headers when building against [email protected] because we have to use -nostdinc.
-        if deps.any? { |d| d.name == "[email protected]" }
-          gcc_include_dir = Utils.safe_popen_read(cc, "--print-file-name=include").chomp
-          gcc_include_fixed_dir = Utils.safe_popen_read(cc, "--print-file-name=include-fixed").chomp
-          paths << gcc_include_dir << gcc_include_fixed_dir
-        end
-        paths
-      end
+  def homebrew_extra_isystem_paths
+    paths = []
+    # Add paths for GCC headers when building against [email protected] because we have to use -nostdinc.
+    if deps.any? { |d| d.name == "[email protected]" }
+      gcc_include_dir = Utils.safe_popen_read(cc, "--print-file-name=include").chomp
+      gcc_include_fixed_dir = Utils.safe_popen_read(cc, "--print-file-name=include-fixed").chomp
+      paths << gcc_include_dir << gcc_include_fixed_dir
+    end
+    paths
+  end
 
-      def determine_rpath_paths(formula)
-        PATH.new(
-          *formula&.lib,
-          "#{HOMEBREW_PREFIX}/opt/gcc/lib/gcc/current",
-          PATH.new(run_time_deps.map { |dep| dep.opt_lib.to_s }).existing,
-          "#{HOMEBREW_PREFIX}/lib",
-        )
-      end
+  def determine_rpath_paths(formula)
+    PATH.new(
+      *formula&.lib,
+      "#{HOMEBREW_PREFIX}/opt/gcc/lib/gcc/current",
+      PATH.new(run_time_deps.map { |dep| dep.opt_lib.to_s }).existing,
+      "#{HOMEBREW_PREFIX}/lib",
+    )
+  end
 
-      sig { returns(T.nilable(String)) }
-      def determine_dynamic_linker_path
-        path = "#{HOMEBREW_PREFIX}/lib/ld.so"
-        return unless File.readable? path
+  sig { returns(T.nilable(String)) }
+  def determine_dynamic_linker_path
+    path = "#{HOMEBREW_PREFIX}/lib/ld.so"
+    return unless File.readable? path
 
-        path
-      end
-    end
+    path
   end
 end
-
-Superenv.prepend(OS::Linux::Superenv)