pass entire build_operation Hash to Builder#run

This commit is contained in:
Josh Holtrop 2017-05-24 14:32:43 -04:00
parent 2655c119e4
commit dce88ece14

View File

@ -572,8 +572,10 @@ module Rscons
builder: builder,
target: target,
sources: sources,
vars: vars,
cache: cache,
env: self,
vars: vars,
setup_info: options[:setup_info]
}
call_build_hooks = lambda do |sec|
@build_hooks[sec].each do |build_hook_block|
@ -588,13 +590,7 @@ module Rscons
if builder.method(:run).arity == 5
rv = builder.run(target, sources, cache, self, vars)
else
rv = builder.run(
target: target,
sources: sources,
cache: cache,
env: self,
vars: vars,
setup_info: options[:setup_info])
rv = builder.run(build_operation)
end
if rv.is_a?(ThreadedCommand)