diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-11-13 15:24:17 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-11-20 11:21:56 +0800 |
| commit | e259779974ea7e109ee75b9b853f73bd0f66a4b3 (patch) | |
| tree | 2ea44df3790f9e8e9b8d61e352d37015c6e8a51a /BaseTools/Source/Python/AutoGen/AutoGen.py | |
| parent | 7a96634889c925b8cc83d90b8791a08354efd56b (diff) | |
| download | edk2-e259779974ea7e109ee75b9b853f73bd0f66a4b3.tar.gz edk2-e259779974ea7e109ee75b9b853f73bd0f66a4b3.tar.bz2 edk2-e259779974ea7e109ee75b9b853f73bd0f66a4b3.zip | |
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>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen/AutoGen.py')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index b3e708951e..008ad8ebc3 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -3267,13 +3267,13 @@ class ModuleAutoGen(AutoGen): EdkLogger.debug(EdkLogger.DEBUG_9, "The toolchain [%s] for processing file [%s] is found, "
"but [%s] is needed" % (F.TagName, str(F), self.ToolChain))
continue
- # match tool chain family
- if F.ToolChainFamily not in ("", "*", self.ToolChainFamily):
+ # match tool chain family or build rule family
+ if F.ToolChainFamily not in ("", "*", self.ToolChainFamily, self.BuildRuleFamily):
EdkLogger.debug(
EdkLogger.DEBUG_0,
"The file [%s] must be built by tools of [%s], " \
- "but current toolchain family is [%s]" \
- % (str(F), F.ToolChainFamily, self.ToolChainFamily))
+ "but current toolchain family is [%s], buildrule family is [%s]" \
+ % (str(F), F.ToolChainFamily, self.ToolChainFamily, self.BuildRuleFamily))
continue
# add the file path into search path list for file including
|