CC builder uses target file name passed in instead of determining it itself

This commit is contained in:
Josh Holtrop 2013-06-26 22:50:44 -04:00
parent 68329ca7ad
commit 256e341e5e

View File

@ -15,16 +15,15 @@ module Rscons
def run(env, target, source) def run(env, target, source)
raise "String expected, not #{source.inspect}" unless source.is_a?(String) raise "String expected, not #{source.inspect}" unless source.is_a?(String)
o_file = "#{env.stem(source)}#{env['OBJSUFFIX']}"
unless Cache.open.up_to_date?(target, [source]) unless Cache.open.up_to_date?(target, [source])
vars = { vars = {
'TARGET' => o_file, 'TARGET' => target,
'SOURCES' => source, 'SOURCES' => source,
} }
env.execute("CC #{o_file}", env['CCCOM'], vars) env.execute("CC #{target}", env['CCCOM'], vars)
Cache.open.register_build(target, [source]) Cache.open.register_build(target, [source])
end end
o_file target
end end
end end
end end