Pass the build object into the Tab
Since the Tab is written in the build process, the formula's build object will have the correct args attached to it already, so we don't need to reconstruct it.
This commit is contained in:
parent
dd331245ab
commit
393e10849b
@ -186,8 +186,7 @@ class Build
|
||||
# link against it.
|
||||
stdlibs = keg.detect_cxx_stdlibs :skip_executables => true
|
||||
|
||||
Tab.create(f, ENV.compiler, stdlibs.first,
|
||||
Options.coerce(ARGV.options_only)).write
|
||||
Tab.create(f, ENV.compiler, stdlibs.first, f.build).write
|
||||
rescue Exception => e
|
||||
if ARGV.debug?
|
||||
debrew e, f
|
||||
|
||||
@ -10,16 +10,13 @@ require 'utils/json'
|
||||
class Tab < OpenStruct
|
||||
FILENAME = 'INSTALL_RECEIPT.json'
|
||||
|
||||
def self.create f, compiler, stdlib, args
|
||||
build = f.build.dup
|
||||
build.args = args
|
||||
|
||||
def self.create(formula, compiler, stdlib, build)
|
||||
Tab.new :used_options => build.used_options,
|
||||
:unused_options => build.unused_options,
|
||||
:tabfile => f.prefix.join(FILENAME),
|
||||
:tabfile => formula.prefix.join(FILENAME),
|
||||
:built_as_bottle => !!ARGV.build_bottle?,
|
||||
:poured_from_bottle => false,
|
||||
:tapped_from => f.tap,
|
||||
:tapped_from => formula.tap,
|
||||
:time => Time.now.to_i,
|
||||
:HEAD => Homebrew.git_head,
|
||||
:compiler => compiler,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user