diff options
Diffstat (limited to 'BaseTools/Source/Python/AutoGen')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 5 |
2 files changed, 4 insertions, 3 deletions
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
diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py index 4abfc6c29d..dd629ba2fa 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -1366,14 +1366,15 @@ class PlatformAutoGen(AutoGen): UniqueName[Module.BaseName] = set()
UniqueName[Module.BaseName].add((self.ModuleGuid(Module),Module.MetaFile))
for module_paths in ModuleNameDict.values():
- if len(module_paths) > 1 and len(set(module_paths))>1:
+ if len(set(module_paths))>1:
samemodules = list(set(module_paths))
EdkLogger.error("build", FILE_DUPLICATED, 'Modules have same BaseName and FILE_GUID:\n'
' %s\n %s' % (samemodules[0], samemodules[1]))
for name in UniqueName:
Guid_Path = UniqueName[name]
if len(Guid_Path) > 1:
- retVal[name] = '%s_%s' % (name,Guid_Path.pop()[0])
+ for guid,mpath in Guid_Path:
+ retVal[(name,mpath)] = '%s_%s' % (name,guid)
return retVal
## Expand * in build option key
#
|