From a911dd5066ebe53fa460ee4a84c916fbc62efb33 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Mon, 10 Mar 2014 14:56:02 -0500
Subject: [PATCH] Make build_from_source an explicit installer mode

---
 Library/Homebrew/bottles.rb     | 1 -
 Library/Homebrew/cmd/install.rb | 1 +
 Library/Homebrew/cmd/upgrade.rb | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 454fb02b0a..fa911d200b 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -13,7 +13,6 @@ end
 
 def install_bottle? f, options={:warn=>false}
   return true if f.local_bottle_path
-  return false if ARGV.build_from_source?
   return true if ARGV.force_bottle?
   return false unless f.pour_bottle?
   return false unless f.default_build?
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 6a3d370ea1..32c82482e4 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -107,6 +107,7 @@ module Homebrew extend self
     fi.ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
     fi.only_deps = ARGV.only_deps?
     fi.build_bottle = ARGV.build_bottle?
+    fi.build_from_source = ARGV.build_from_source?
     fi.prelude
     fi.install
     fi.caveats
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index c2c0582a4e..5488535401 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -60,6 +60,7 @@ module Homebrew extend self
     installer.options |= Tab.for_formula(f).used_options
     installer.show_header = false
     installer.ignore_deps = false
+    installer.build_from_source = ARGV.build_from_source?
     installer.prelude
 
     oh1 "Upgrading #{f.name}"