Merge bottle install without Xcode branch

Merge branch 'bottle_hooks'

5 files changed, 16 insertions, 7 deletions

diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb
index 7627d6e97..74b4f436e 100644
--- a/Library/Homebrew/cmd/config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -7,23 +7,23 @@ module Homebrew
   end
 
   def llvm
-    @llvm ||= MacOS.llvm_build_version
+    @llvm ||= MacOS.llvm_build_version if MacOS.has_apple_developer_tools?
   end
 
   def gcc_42
-    @gcc_42 ||= MacOS.gcc_42_build_version
+    @gcc_42 ||= MacOS.gcc_42_build_version if MacOS.has_apple_developer_tools?
   end
 
   def gcc_40
-    @gcc_40 ||= MacOS.gcc_40_build_version
+    @gcc_40 ||= MacOS.gcc_40_build_version if MacOS.has_apple_developer_tools?
   end
 
   def clang
-    @clang ||= MacOS.clang_version
+    @clang ||= MacOS.clang_version if MacOS.has_apple_developer_tools?
   end
 
   def clang_build
-    @clang_build ||= MacOS.clang_build_version
+    @clang_build ||= MacOS.clang_build_version if MacOS.has_apple_developer_tools?
   end
 
   def xcode
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 7ceb88b7e..97e31a8e2 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -258,6 +258,7 @@ class Checks
     end
   end
 
+  # TODO: distill down into single method definition a la BuildToolsError
   if MacOS.version >= "10.9"
     def check_for_installed_developer_tools
       unless MacOS::Xcode.installed? || MacOS::CLT.installed? then <<-EOS.undent
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 19c826d44..47735a23c 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -38,6 +38,10 @@ module Homebrew
         end
       end
 
+      # if the user's flags will prevent bottle only-installations when no
+      # developer tools are available, we need to stop them early on
+      FormulaInstaller.prevent_build_flags unless MacOS.has_apple_developer_tools?
+
       ARGV.formulae.each do |f|
         # head-only without --HEAD is an error
         if !ARGV.build_head? && f.stable.nil? && f.devel.nil?
@@ -131,10 +135,10 @@ module Homebrew
     checks = Checks.new
     %w[
       check_for_unsupported_osx
+      check_for_bad_install_name_tool
       check_for_installed_developer_tools
       check_xcode_license_approved
       check_for_osx_gcc_installer
-      check_for_bad_install_name_tool
     ].each do |check|
       out = checks.send(check)
       opoo out unless out.nil?
@@ -161,7 +165,7 @@ module Homebrew
   def perform_preinstall_checks
     check_ppc
     check_writable_install_location
-    check_xcode
+    check_xcode if MacOS.has_apple_developer_tools?
     check_cellar
   end
 
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index fe5e2e5ec..435c3155f 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -2,6 +2,8 @@ require "formula_installer"
 
 module Homebrew
   def reinstall
+    FormulaInstaller.prevent_build_flags unless MacOS.has_apple_developer_tools?
+
     ARGV.resolved_formulae.each { |f| reinstall_formula(f) }
   end
 
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 211d081e7..e1b7dd0dc 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -3,6 +3,8 @@ require "cmd/outdated"
 
 module Homebrew
   def upgrade
+    FormulaInstaller.prevent_build_flags unless MacOS.has_apple_developer_tools?
+
     Homebrew.perform_preinstall_checks
 
     if ARGV.named.empty?