From 9386902cf8c1e3311337b36615ee5e2c4ec9edf4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 27 Aug 2014 17:25:13 -0500 Subject: [PATCH] Explicitly pass options into the build object --- Library/Homebrew/build.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 006beefb00..29252ea993 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -4,6 +4,7 @@ old_trap = trap("INT") { exit! 130 } require "global" +require "build_options" require "cxxstdlib" require "keg" require "extend/ENV" @@ -13,8 +14,9 @@ require "fcntl" class Build attr_reader :formula, :deps, :reqs - def initialize(formula) + def initialize(formula, options) @formula = formula + @formula.build = BuildOptions.new(options, formula.options) if ARGV.ignore_deps? @deps = [] @@ -183,7 +185,10 @@ system "/usr/bin/sudo", "-k" trap("INT", old_trap) begin - Build.new(ARGV.formulae.first).install + formula = ARGV.formulae.first + options = Options.create(ARGV.options_only) + build = Build.new(formula, options) + build.install rescue Exception => e e.continuation = nil if ARGV.debug? Marshal.dump(e, error_pipe)