superenv: move check logic into superenv?

Fixes Homebrew/homebrew#16292.

1 files changed, 2 insertions, 5 deletions

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index b79bba914..993a51b1e 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -17,6 +17,8 @@ def superbin
 end
 
 def superenv?
+  not (MacSystem.xcode43_without_clt? and
+  MacOS.sdk_path.nil?) and # because superenv will fail to find stuff
   not MacOS::Xcode.folder.nil? and # because xcrun won't work
   superbin and superbin.directory? and
   not ARGV.include? "--env=std"
@@ -40,7 +42,6 @@ class << ENV
 
   def setup_build_environment
     reset
-    check
     ENV['CC'] = 'cc'
     ENV['CXX'] = 'c++'
     ENV['OBJC'] = 'cc'
@@ -61,10 +62,6 @@ class << ENV
     ENV['ACLOCAL_PATH'] = determine_aclocal_path
   end
 
-  def check
-    raise if MacSystem.xcode43_without_clt? and MacOS.sdk_path.nil?
-  end
-
   def universal_binary
     append 'HOMEBREW_CCCFG', "u", ''
   end