From bb33a59c7b282a674a1bb03ba224544ef57352bd Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 7 Apr 2020 16:43:32 +0100 Subject: [PATCH] os/mac/sdk: add SDK source attribute --- Library/Homebrew/os/mac/sdk.rb | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb index a3a8dcf83d..156c41812d 100644 --- a/Library/Homebrew/os/mac/sdk.rb +++ b/Library/Homebrew/os/mac/sdk.rb @@ -5,11 +5,12 @@ require "os/mac/version" module OS module Mac class SDK - attr_reader :version, :path + attr_reader :version, :path, :source - def initialize(version, path) + def initialize(version, path, source) @version = OS::Mac::Version.new version @path = Pathname.new(path) + @source = source end end @@ -20,14 +21,14 @@ module OS path = sdk_paths[v] raise NoSDKError if path.nil? - SDK.new v, path + SDK.new v, path, source end def latest_sdk return if sdk_paths.empty? v, path = sdk_paths.max { |a, b| OS::Mac::Version.new(a[0]) <=> OS::Mac::Version.new(b[0]) } - SDK.new v, path + SDK.new v, path, source end def sdk_if_applicable(v = nil) @@ -48,6 +49,10 @@ module OS private + def source + nil + end + def source_version OS::Mac::Version::NULL end @@ -78,6 +83,10 @@ module OS class XcodeSDKLocator < BaseSDKLocator private + def source + :xcode + end + def source_version OS::Mac::Xcode.version end @@ -98,6 +107,10 @@ module OS class CLTSDKLocator < BaseSDKLocator private + def source + :clt + end + def source_version OS::Mac::CLT.version end