josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix: Object and SharedObject should respect vars when checking source suffixes

Browse Source
This commit is contained in:
Josh Holtrop 2017-06-07 09:52:11 -04:00
parent ed5d6e9e49
commit aa192d7567
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rscons/builders/object.rb
View File

@ -92,7 +92,7 @@ module Rscons
'_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)), '_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)),
}) })
com_prefix = KNOWN_SUFFIXES.find do |compiler, suffix_var| 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| end.tap do |v|
v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}" v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}"
end.first end.first

2
lib/rscons/builders/shared_object.rb
View File

@ -70,7 +70,7 @@ module Rscons
'_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)), '_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)),
}) })
com_prefix = KNOWN_SUFFIXES.find do |compiler, suffix_var| 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| end.tap do |v|
v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}" v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}"
end.first end.first