From 1f29f7092979470b6cfb56160ef7cd8f530298d5 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sun, 8 Mar 2020 20:09:06 +0000 Subject: [PATCH] os/mac: prefer CLT SDK over Xcode --- Library/Homebrew/os/mac.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 27c92bbf7c..73dc51389b 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -85,10 +85,10 @@ module OS # if available. Otherwise, the latest SDK is returned. def sdk(v = nil) - @locator ||= if Xcode.installed? - XcodeSDKLocator.new - else + @locator ||= if CLT.installed? && CLT.provides_sdk? CLTSDKLocator.new + else + XcodeSDKLocator.new end @locator.sdk_if_applicable(v) @@ -101,7 +101,7 @@ module OS end def sdk_path_if_needed(v = nil) - # Prefer Xcode SDK when both Xcode and the CLT are installed. + # Prefer CLT SDK when both Xcode and the CLT are installed. # Expected results: # 1. On Xcode-only systems, return the Xcode SDK. # 2. On Xcode-and-CLT systems where headers are provided by the system, return nil.