From aa192d756771b0798c4a046710ddaf5c345ec531 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 7 Jun 2017 09:52:11 -0400 Subject: [PATCH] bugfix: Object and SharedObject should respect vars when checking source suffixes --- lib/rscons/builders/object.rb | 2 +- lib/rscons/builders/shared_object.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rscons/builders/object.rb b/lib/rscons/builders/object.rb index 6822021..b91916b 100644 --- a/lib/rscons/builders/object.rb +++ b/lib/rscons/builders/object.rb @@ -92,7 +92,7 @@ module Rscons '_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)), }) com_prefix = KNOWN_SUFFIXES.find do |compiler, suffix_var| - sources.first.end_with?(*env.expand_varref("${#{suffix_var}}")) + sources.first.end_with?(*env.expand_varref("${#{suffix_var}}", vars)) end.tap do |v| v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}" end.first diff --git a/lib/rscons/builders/shared_object.rb b/lib/rscons/builders/shared_object.rb index 043ff4c..1f58d28 100644 --- a/lib/rscons/builders/shared_object.rb +++ b/lib/rscons/builders/shared_object.rb @@ -70,7 +70,7 @@ module Rscons '_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)), }) com_prefix = KNOWN_SUFFIXES.find do |compiler, suffix_var| - sources.first.end_with?(*env.expand_varref("${#{suffix_var}}")) + sources.first.end_with?(*env.expand_varref("${#{suffix_var}}", vars)) end.tap do |v| v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}" end.first