Merge pull request #7426 from Bo98/std-sdk

ENV/std: port superenv SDK changes

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

@@ -41,23 +41,23 @@ def setup_build_environment(formula = nil)
     self["LC_CTYPE"] = "C"
 
     # Add lib and include etc. from the current macosxsdk to compiler flags:
-    macosxsdk MacOS.version
+    macosxsdk(formula: formula)
 
     return unless MacOS::Xcode.without_clt?
 
     append_path "PATH", "#{MacOS::Xcode.prefix}/usr/bin"
     append_path "PATH", "#{MacOS::Xcode.toolchain_path}/usr/bin"
   end
 
-  def remove_macosxsdk(version = MacOS.version)
+  def remove_macosxsdk(version = nil)
     # Clear all lib and include dirs from CFLAGS, CPPFLAGS, LDFLAGS that were
     # previously added by macosxsdk
-    version = version.to_s
     remove_from_cflags(/ ?-mmacosx-version-min=10\.\d+/)
     delete("CPATH")
     remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
 
-    return unless (sdk = MacOS.sdk_path_if_needed(version))
+    sdk = self["SDKROOT"] || MacOS.sdk_path_if_needed(version)
+    return unless sdk
 
     delete("SDKROOT")
     remove_from_cflags "-isysroot#{sdk}"
@@ -72,15 +72,18 @@ def remove_macosxsdk(version = MacOS.version)
     remove "CMAKE_FRAMEWORK_PATH", "#{sdk}/System/Library/Frameworks"
   end
 
-  def macosxsdk(version = MacOS.version)
+  def macosxsdk(version = nil, formula: nil)
     # Sets all needed lib and include dirs to CFLAGS, CPPFLAGS, LDFLAGS.
     remove_macosxsdk
-    version = version.to_s
-    append_to_cflags("-mmacosx-version-min=#{version}")
+    min_version = version || MacOS.version
+    append_to_cflags("-mmacosx-version-min=#{min_version}")
     self["CPATH"] = "#{HOMEBREW_PREFIX}/include"
     prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
 
-    return unless (sdk = MacOS.sdk_path_if_needed(version))
+    sdk = formula ? MacOS.sdk_for_formula(formula, version) : MacOS.sdk(version)
+    return if !MacOS.sdk_root_needed? && sdk.source != :xcode
+
+    sdk = sdk.path
 
     # Extra setup to support Xcode 4.3+ without CLT.
     self["SDKROOT"] = sdk
@@ -99,10 +102,10 @@ def macosxsdk(version = MacOS.version)
   # Some configure scripts won't find libxml2 without help
   # This is a no-op with macOS SDK 10.15.4 and later
   def libxml2
-    sdk = MacOS.sdk_path_if_needed
+    sdk = self["SDKROOT"] || MacOS.sdk_path_if_needed
     if !sdk
       append "CPPFLAGS", "-I/usr/include/libxml2"
-    elsif !(sdk/"usr/include/libxml").directory?
+    elsif !Pathname("#{sdk}/usr/include/libxml").directory?
       # Use the includes form the sdk
       append "CPPFLAGS", "-I#{sdk}/usr/include/libxml2"
     end

Library/Homebrew/test.rb

@@ -20,16 +20,16 @@
   error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io)
   error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
-  ENV.extend(Stdenv)
-  ENV.setup_build_environment
-
   trap("INT", old_trap)
 
   formula = Homebrew.args.resolved_formulae.first
   formula.extend(Homebrew::Assertions)
   formula.extend(Homebrew::FreePort)
   formula.extend(Debrew::Formula) if Homebrew.args.debug?
 
+  ENV.extend(Stdenv)
+  ENV.setup_build_environment(formula)
+
   # tests can also return false to indicate failure
   Timeout.timeout TEST_TIMEOUT_SECONDS do
     raise "test returned false" if formula.run_test == false