From 4de9dd0cfab40418fb9b73656f0c2e69ce55a0ed Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 8 Apr 2022 16:54:27 +0100 Subject: [PATCH] ENV/super: always set HOMEBREW_DEVELOPER_DIR regardless of macOS version --- .../extend/os/mac/extend/ENV/super.rb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index 9e96f2f7e4..c05535a800 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -87,19 +87,19 @@ module Superenv # @private def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false) sdk = formula ? MacOS.sdk_for_formula(formula) : MacOS.sdk - if MacOS.sdk_root_needed? || sdk&.source == :xcode - Homebrew::Diagnostic.checks(:fatal_setup_build_environment_checks) - self["HOMEBREW_SDKROOT"] = sdk.path + is_xcode_sdk = sdk&.source == :xcode - self["HOMEBREW_DEVELOPER_DIR"] = if sdk.source == :xcode - MacOS::Xcode.prefix - else - MacOS::CLT::PKG_PATH - end - else - self["HOMEBREW_SDKROOT"] = nil - self["HOMEBREW_DEVELOPER_DIR"] = nil + self["HOMEBREW_SDKROOT"] = if is_xcode_sdk || MacOS.sdk_root_needed? + Homebrew::Diagnostic.checks(:fatal_setup_build_environment_checks) + sdk.path end + + self["HOMEBREW_DEVELOPER_DIR"] = if is_xcode_sdk + MacOS::Xcode.prefix + else + MacOS::CLT::PKG_PATH + end + generic_setup_build_environment( formula: formula, cc: cc, build_bottle: build_bottle, bottle_arch: bottle_arch, testing_formula: testing_formula