mirror of https://github.com/acidanthera/audk.git
BaseTools: Fix the bug to collect source files per build rule family
when collect source files list we should also consider build rule family. BuildRuleFamily may be set to the different one. It will impact BuildRule and source files in INF file. Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=780 Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
parent
7a96634889
commit
e259779974
|
@ -3267,13 +3267,13 @@ class ModuleAutoGen(AutoGen):
|
||||||
EdkLogger.debug(EdkLogger.DEBUG_9, "The toolchain [%s] for processing file [%s] is found, "
|
EdkLogger.debug(EdkLogger.DEBUG_9, "The toolchain [%s] for processing file [%s] is found, "
|
||||||
"but [%s] is needed" % (F.TagName, str(F), self.ToolChain))
|
"but [%s] is needed" % (F.TagName, str(F), self.ToolChain))
|
||||||
continue
|
continue
|
||||||
# match tool chain family
|
# match tool chain family or build rule family
|
||||||
if F.ToolChainFamily not in ("", "*", self.ToolChainFamily):
|
if F.ToolChainFamily not in ("", "*", self.ToolChainFamily, self.BuildRuleFamily):
|
||||||
EdkLogger.debug(
|
EdkLogger.debug(
|
||||||
EdkLogger.DEBUG_0,
|
EdkLogger.DEBUG_0,
|
||||||
"The file [%s] must be built by tools of [%s], " \
|
"The file [%s] must be built by tools of [%s], " \
|
||||||
"but current toolchain family is [%s]" \
|
"but current toolchain family is [%s], buildrule family is [%s]" \
|
||||||
% (str(F), F.ToolChainFamily, self.ToolChainFamily))
|
% (str(F), F.ToolChainFamily, self.ToolChainFamily, self.BuildRuleFamily))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# add the file path into search path list for file including
|
# add the file path into search path list for file including
|
||||||
|
|
Loading…
Reference in New Issue