pass entire build_operation Hash to Builder#run
This commit is contained in:
parent
2655c119e4
commit
dce88ece14
@ -572,8 +572,10 @@ module Rscons
|
|||||||
builder: builder,
|
builder: builder,
|
||||||
target: target,
|
target: target,
|
||||||
sources: sources,
|
sources: sources,
|
||||||
vars: vars,
|
cache: cache,
|
||||||
env: self,
|
env: self,
|
||||||
|
vars: vars,
|
||||||
|
setup_info: options[:setup_info]
|
||||||
}
|
}
|
||||||
call_build_hooks = lambda do |sec|
|
call_build_hooks = lambda do |sec|
|
||||||
@build_hooks[sec].each do |build_hook_block|
|
@build_hooks[sec].each do |build_hook_block|
|
||||||
@ -588,13 +590,7 @@ module Rscons
|
|||||||
if builder.method(:run).arity == 5
|
if builder.method(:run).arity == 5
|
||||||
rv = builder.run(target, sources, cache, self, vars)
|
rv = builder.run(target, sources, cache, self, vars)
|
||||||
else
|
else
|
||||||
rv = builder.run(
|
rv = builder.run(build_operation)
|
||||||
target: target,
|
|
||||||
sources: sources,
|
|
||||||
cache: cache,
|
|
||||||
env: self,
|
|
||||||
vars: vars,
|
|
||||||
setup_info: options[:setup_info])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if rv.is_a?(ThreadedCommand)
|
if rv.is_a?(ThreadedCommand)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user