tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Fix one or more multiply defined symbols found issue 

self.Guids update with package Guids will generate multiply defined
GUID symbols in AutoGen file

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Feng, YunhuaX 2018-04-13 13:20:31 +08:00 committed by Yonghong Zhu
parent 2167c7f7a5
commit e7df35b2bc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BaseTools/Source/Python/Workspace/InfBuildData.py
View File

@ -997,6 +997,7 @@ class InfBuildData(ModuleBuildClassObject):
self._PcdComments[TokenSpaceGuid, PcdCName] = Comments self._PcdComments[TokenSpaceGuid, PcdCName] = Comments
# resolve PCD type, value, datum info, etc. by getting its definition from package # resolve PCD type, value, datum info, etc. by getting its definition from package
_GuidDict = self.Guids.copy()
for PcdCName, TokenSpaceGuid in PcdList: for PcdCName, TokenSpaceGuid in PcdList:
PcdRealName = PcdCName PcdRealName = PcdCName
Setting, LineNo = PcdDict[self._Arch, self.Platform, PcdCName, TokenSpaceGuid] Setting, LineNo = PcdDict[self._Arch, self.Platform, PcdCName, TokenSpaceGuid]
@ -1050,7 +1051,7 @@ class InfBuildData(ModuleBuildClassObject):
# #
# "FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx" # "FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"
# #
self.Guids.update(Package.Guids) _GuidDict.update(Package.Guids)
PcdType = self._PCD_TYPE_STRING_[Type] PcdType = self._PCD_TYPE_STRING_[Type]
if Type == MODEL_PCD_DYNAMIC: if Type == MODEL_PCD_DYNAMIC:
Pcd.Pending = True Pcd.Pending = True
@ -1142,7 +1143,7 @@ class InfBuildData(ModuleBuildClassObject):
Pcd.DefaultValue = PcdInPackage.DefaultValue Pcd.DefaultValue = PcdInPackage.DefaultValue
else: else:
try: try:
Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, self.Guids)(True) Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, _GuidDict)(True)
except BadExpression, Value: except BadExpression, Value:
EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value), EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value),
File=self.MetaFile, Line=LineNo) File=self.MetaFile, Line=LineNo)