From 71344b478282222132104081833dfcce687692f2 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 5 Nov 2013 15:41:47 -0500 Subject: [PATCH] Program: do not check env.build_sources() return value (it will raise an exception if something was wrong) --- lib/rscons/builders/program.rb | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/lib/rscons/builders/program.rb b/lib/rscons/builders/program.rb index e352bab..089dd4a 100644 --- a/lib/rscons/builders/program.rb +++ b/lib/rscons/builders/program.rb @@ -17,24 +17,22 @@ module Rscons def run(target, sources, cache, env, vars = {}) # build sources to linkable objects objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars) - if objects - ld = if env["LD"] - env["LD"] - elsif sources.find {|s| s.has_suffix?(env["DSUFFIX"])} - env["DC"] - elsif sources.find {|s| s.has_suffix?(env["CXXSUFFIX"])} - env["CXX"] - else - env["CC"] - end - vars = vars.merge({ - '_TARGET' => target, - '_SOURCES' => objects, - 'LD' => ld, - }) - command = env.build_command(env['LDCOM'], vars) - standard_build("LD #{target}", target, command, objects, env, cache) - end + ld = if env["LD"] + env["LD"] + elsif sources.find {|s| s.has_suffix?(env["DSUFFIX"])} + env["DC"] + elsif sources.find {|s| s.has_suffix?(env["CXXSUFFIX"])} + env["CXX"] + else + env["CC"] + end + vars = vars.merge({ + '_TARGET' => target, + '_SOURCES' => objects, + 'LD' => ld, + }) + command = env.build_command(env['LDCOM'], vars) + standard_build("LD #{target}", target, command, objects, env, cache) end end end