From 4f8a75157929f7141ee6fe3ce2b98eabbdc7b0fe Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Thu, 26 Jul 2018 17:56:47 -0700 Subject: [PATCH] SDK: allow finding CLT SDK path where present --- Library/Homebrew/os/mac/sdk.rb | 2 +- Library/Homebrew/os/mac/xcode.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb index 5060b7807c..3da35cc7ae 100644 --- a/Library/Homebrew/os/mac/sdk.rb +++ b/Library/Homebrew/os/mac/sdk.rb @@ -82,7 +82,7 @@ module OS # return nil SDKs for Xcode 9 and older. def sdk_prefix @sdk_prefix ||= begin - if !CLT.separate_header_package? + if !CLT.provides_sdk? "" else "#{CLT::PKG_PATH}/SDKs" diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 8799de22ae..b1b25a60b9 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -214,6 +214,10 @@ module OS version >= "10" end + def provides_sdk? + version >= "8" + end + def headers_installed? if !separate_header_package? installed?