From 76e12fa33416f3133c41c6e396a69abbe32f2edb Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Fri, 16 Aug 2019 13:52:46 +0800 Subject: BaseTools: Fixed issue of incorrect Module Unique Name https://bugzilla.tianocore.org/show_bug.cgi?id=2088 If there are more than one override instance for a same module, the Module Unique Name is generated incorrectly. Cc: Liming Gao Cc: Steven Shi Signed-off-by: Bob Feng Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/AutoGen/ModuleAutoGen.py') diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index 9ecf5c2dbe..076ce0e39c 100644 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -295,7 +295,7 @@ class ModuleAutoGen(AutoGen): ModuleNames = self.DataPipe.Get("M_Name") if not ModuleNames: return self.Name - return ModuleNames.get(self.Name,self.Name) + return ModuleNames.get((self.Name,self.MetaFile),self.Name) # Macros could be used in build_rule.txt (also Makefile) @cached_property -- cgit v1.2.3