Merge pull request #16218 from Bo98/env-shared-macos-fix

ENV/shared: fix macOS code not applying under HOMEBREW_SORBET_RUNTIME
Homebrew · Nov 14, 2023 · 6de29c2 · 6de29c2
2 parents b58c93a + 63a8474
commit 6de29c2
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb
@@ -2,6 +2,16 @@
 # frozen_string_literal: true
 
 module SharedEnvExtension
+  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_shared_setup_build_environment(formula: formula, cc: cc, build_bottle: build_bottle,
@@ -11,6 +21,7 @@ def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_a
     # Normalise the system Perl version used, where multiple may be available
     self["VERSIONER_PERL_VERSION"] = MacOS.preferred_perl_version
   end
+  private :setup_build_environment
 
   sig { returns(T::Boolean) }
   def no_weak_imports_support?