From 5e42e9b8685ab2dc26fe75fefa3caefef6894537 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 26 Jun 2013 21:37:52 -0400 Subject: [PATCH] define and use $CCCOM variable for CC command --- lib/rscons/builders/cc.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/rscons/builders/cc.rb b/lib/rscons/builders/cc.rb index 3453ce3..37882f7 100644 --- a/lib/rscons/builders/cc.rb +++ b/lib/rscons/builders/cc.rb @@ -2,10 +2,11 @@ module Rscons class CC < Builder VARIABLE_DEFAULTS = { 'CC' => 'gcc', - 'CFLAGS' => ['-c'], + 'CFLAGS' => [], 'CPPFLAGS' => [], 'OBJSUFFIX' => '.o', 'CEXTS' => ['.c'], + 'CCCOM' => ['$CC', '-c', '-o', '$TARGET', '$CPPFLAGS', '$CFLAGS', '$SOURCES'] } def self.produces?(env, suffix) @@ -16,18 +17,11 @@ module Rscons 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]) - command = [ - env['CC'], - *env['CPPFLAGS'], - *env['CFLAGS'], - '-o', o_file, - source - ] vars = { 'TARGET' => o_file, 'SOURCES' => source, } - env.execute("CC #{o_file}", command, vars) + env.execute("CC #{o_file}", env['CCCOM'], vars) Cache.open.register_build(target, [source]) end o_file