Merge pull request #13104 from Bo98/developer_dir-always
ENV/super: always set HOMEBREW_DEVELOPER_DIR regardless of macOS version
This commit is contained in:
commit
3f60be3042
@ -87,19 +87,19 @@ module Superenv
|
|||||||
# @private
|
# @private
|
||||||
def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_arch: nil, testing_formula: false)
|
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
|
sdk = formula ? MacOS.sdk_for_formula(formula) : MacOS.sdk
|
||||||
if MacOS.sdk_root_needed? || sdk&.source == :xcode
|
is_xcode_sdk = sdk&.source == :xcode
|
||||||
Homebrew::Diagnostic.checks(:fatal_setup_build_environment_checks)
|
|
||||||
self["HOMEBREW_SDKROOT"] = sdk.path
|
|
||||||
|
|
||||||
self["HOMEBREW_DEVELOPER_DIR"] = if sdk.source == :xcode
|
self["HOMEBREW_SDKROOT"] = if is_xcode_sdk || MacOS.sdk_root_needed?
|
||||||
MacOS::Xcode.prefix
|
Homebrew::Diagnostic.checks(:fatal_setup_build_environment_checks)
|
||||||
else
|
sdk.path
|
||||||
MacOS::CLT::PKG_PATH
|
|
||||||
end
|
|
||||||
else
|
|
||||||
self["HOMEBREW_SDKROOT"] = nil
|
|
||||||
self["HOMEBREW_DEVELOPER_DIR"] = nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self["HOMEBREW_DEVELOPER_DIR"] = if is_xcode_sdk
|
||||||
|
MacOS::Xcode.prefix
|
||||||
|
else
|
||||||
|
MacOS::CLT::PKG_PATH
|
||||||
|
end
|
||||||
|
|
||||||
generic_setup_build_environment(
|
generic_setup_build_environment(
|
||||||
formula: formula, cc: cc, build_bottle: build_bottle,
|
formula: formula, cc: cc, build_bottle: build_bottle,
|
||||||
bottle_arch: bottle_arch, testing_formula: testing_formula
|
bottle_arch: bottle_arch, testing_formula: testing_formula
|
||||||
|
Loading…
x
Reference in New Issue
Block a user