development_tools: add installed? method. (#455)

2 files changed, 11 insertions, 1 deletions

diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 1ef5c465d..25ee5c0aa 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -1,4 +1,5 @@
 require "extend/ENV/shared"
+require "development_tools"
 
 # ### Why `superenv`?
 #
@@ -26,7 +27,7 @@ module Superenv
 
   # @private
   def self.bin
-    return unless MacOS.has_apple_developer_tools?
+    return unless DevelopmentTools.installed?
 
     bin = HOMEBREW_ENV_PATH.subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max
     bin.realpath unless bin.nil?
diff --git a/Library/Homebrew/extend/os/mac/development_tools.rb b/Library/Homebrew/extend/os/mac/development_tools.rb
index b80be4c81..1afab513b 100644
--- a/Library/Homebrew/extend/os/mac/development_tools.rb
+++ b/Library/Homebrew/extend/os/mac/development_tools.rb
@@ -1,3 +1,5 @@
+require "os/mac/xcode"
+
 # @private
 class DevelopmentTools
   class << self
@@ -13,6 +15,13 @@ class DevelopmentTools
       end
     end
 
+    # Checks if the user has any developer tools installed, either via Xcode
+    # or the CLT. Convenient for guarding against formula builds when building
+    # is impossible.
+    def installed?
+      MacOS::Xcode.installed? || MacOS::CLT.installed?
+    end
+
     def default_compiler
       case default_cc
       # if GCC 4.2 is installed, e.g. via Tigerbrew, prefer it