admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Never trigger too old CLT check on <10.7.

Browse Source 
While we fake a CLT for these versions they never shipped with the CLT
so cannot update it.
This commit is contained in:
Mike McQuaid 2016-12-18 15:31:15 -08:00
parent 201b45d2ca
commit 477faf073b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -116,7 +116,7 @@ module Homebrew
def check_xcode_minimum_version def check_xcode_minimum_version
return unless MacOS::Xcode.installed? return unless MacOS::Xcode.installed?
return unless MacOS::Xcode.minimum_version? return unless MacOS::Xcode.below_minimum_version?
<<-EOS.undent <<-EOS.undent
Your Xcode (#{MacOS::Xcode.version}) is too outdated. Your Xcode (#{MacOS::Xcode.version}) is too outdated.
@ -127,7 +127,7 @@ module Homebrew
def check_clt_minimum_version def check_clt_minimum_version
return unless MacOS::CLT.installed? return unless MacOS::CLT.installed?
return unless MacOS::CLT.minimum_version? return unless MacOS::CLT.below_minimum_version?
<<-EOS.undent <<-EOS.undent
Your Command Line Tools are too outdated. Your Command Line Tools are too outdated.

9
Library/Homebrew/os/mac/xcode.rb
View File

@ -32,7 +32,7 @@ module OS
end end
end end
def minimum_version? def below_minimum_version?
version < minimum_version version < minimum_version
end end
@ -231,11 +231,16 @@ module OS
end end
end end
def minimum_version? def below_minimum_version?
# Lion was the first version of OS X to ship with a CLT
return false if MacOS.version < :lion
version < minimum_version version < minimum_version
end end
def outdated? def outdated?
# Lion was the first version of OS X to ship with a CLT
return false if MacOS.version < :lion
if MacOS.version >= :mavericks if MacOS.version >= :mavericks
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version") version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else else