From 256e341e5efabf606acbecd2564e97deac2c4518 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 26 Jun 2013 22:50:44 -0400 Subject: [PATCH] CC builder uses target file name passed in instead of determining it itself --- lib/rscons/builders/cc.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/rscons/builders/cc.rb b/lib/rscons/builders/cc.rb index 37882f7..d162e06 100644 --- a/lib/rscons/builders/cc.rb +++ b/lib/rscons/builders/cc.rb @@ -15,16 +15,15 @@ module Rscons def run(env, target, source) 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]) vars = { - 'TARGET' => o_file, + 'TARGET' => target, 'SOURCES' => source, } - env.execute("CC #{o_file}", env['CCCOM'], vars) + env.execute("CC #{target}", env['CCCOM'], vars) Cache.open.register_build(target, [source]) end - o_file + target end end end