remove some builder-tracked fields from the build_operation Hash
This commit is contained in:
1 parent
d047a1bf29
commit
935848c3b5
8 files changed
+23
-24
No files matched your search
@@ -203,9 +203,8 @@ module Rscons
|
||||
# The target name on success or nil on failure.
|
||||
def standard_finalize(options)
|
||||
if options[:command_status]
|
||||
target, sources, cache, env = options.values_at(:target, :sources, :cache, :env)
|
||||
cache.register_build(target, options[:tc].command, sources, env)
|
||||
target
|
||||
@cache.register_build(@target, options[:tc].command, @sources, @env)
|
||||
@target
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -38,7 +38,6 @@ module Rscons
|
||||
def run(options)
|
||||
@vars["_TARGET"] = @target
|
||||
@vars["_SOURCES"] = @objects
|
||||
options[:sources] = @objects
|
||||
command = @env.build_command("${ARCMD}", @vars)
|
||||
standard_threaded_build("AR #{@target}", @target, command, @objects, @env, @cache)
|
||||
end
|
||||
@@ -51,7 +50,10 @@ module Rscons
|
||||
# @return [String, nil]
|
||||
# The target name on success or nil on failure.
|
||||
def finalize(options)
|
||||
standard_finalize(options)
|
||||
if options[:command_status]
|
||||
@cache.register_build(@target, options[:tc].command, @objects, @env)
|
||||
@target
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -59,7 +59,6 @@ module Rscons
|
||||
@vars["_TARGET"] = @target
|
||||
@vars["_SOURCES"] = @objects
|
||||
@vars["LD"] = ld
|
||||
options[:sources] = @objects
|
||||
command = @env.build_command("${LDCMD}", @vars)
|
||||
standard_threaded_build("LD #{@target}", @target, command, @objects, @env, @cache)
|
||||
end
|
||||
@@ -72,7 +71,10 @@ module Rscons
|
||||
# @return [String, nil]
|
||||
# The target name on success or nil on failure.
|
||||
def finalize(options)
|
||||
standard_finalize(options)
|
||||
if options[:command_status]
|
||||
@cache.register_build(@target, options[:tc].command, @objects, @env)
|
||||
@target
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -71,7 +71,6 @@ module Rscons
|
||||
@vars["_TARGET"] = @target
|
||||
@vars["_SOURCES"] = @objects
|
||||
@vars["SHLD"] = ld
|
||||
options[:sources] = @objects
|
||||
command = @env.build_command("${SHLDCMD}", @vars)
|
||||
standard_threaded_build("SHLD #{@target}", @target, command, @objects, @env, @cache)
|
||||
end
|
||||
@@ -84,7 +83,10 @@ module Rscons
|
||||
# @return [String, nil]
|
||||
# The target name on success or nil on failure.
|
||||
def finalize(options)
|
||||
standard_finalize(options)
|
||||
if options[:command_status]
|
||||
@cache.register_build(@target, options[:tc].command, @objects, @env)
|
||||
@target
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -515,11 +515,7 @@ module Rscons
|
||||
builder.vars = @varset.merge(builder.vars)
|
||||
build_operation = {
|
||||
builder: builder,
|
||||
target: builder.target,
|
||||
sources: builder.sources,
|
||||
cache: cache,
|
||||
env: self,
|
||||
vars: builder.vars,
|
||||
}
|
||||
call_build_hooks = lambda do |sec|
|
||||
@build_hooks[sec].each do |build_hook_block|
|
||||
|
||||
Reference in new issue
Block a user