aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-12-18 15:56:40 -0800
committerGitHub2016-12-18 15:56:40 -0800
commitf8dfad470f4b1116544fd19b3a56e256fb3b5038 (patch)
tree037c09e7efdc41a0b12a796c86bf001bd418052b /Library
parent201b45d2cace5237b555a56af30703e3fd1fc4c2 (diff)
parent477faf073bd0e500bbdea65239430b6a6bd3b54b (diff)
downloadbrew-f8dfad470f4b1116544fd19b3a56e256fb3b5038.tar.bz2
Merge pull request #1652 from MikeMcQuaid/tweak-too-old-clt-check
Never trigger too old CLT check on <10.7.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/os/mac/diagnostic.rb4
-rw-r--r--Library/Homebrew/os/mac/xcode.rb9
2 files changed, 9 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 157e7982b..55be7b191 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -116,7 +116,7 @@ module Homebrew
def check_xcode_minimum_version
return unless MacOS::Xcode.installed?
- return unless MacOS::Xcode.minimum_version?
+ return unless MacOS::Xcode.below_minimum_version?
<<-EOS.undent
Your Xcode (#{MacOS::Xcode.version}) is too outdated.
@@ -127,7 +127,7 @@ module Homebrew
def check_clt_minimum_version
return unless MacOS::CLT.installed?
- return unless MacOS::CLT.minimum_version?
+ return unless MacOS::CLT.below_minimum_version?
<<-EOS.undent
Your Command Line Tools are too outdated.
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index bc1d66ef8..4ab863a5d 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -32,7 +32,7 @@ module OS
end
end
- def minimum_version?
+ def below_minimum_version?
version < minimum_version
end
@@ -231,11 +231,16 @@ module OS
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
end
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
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else