BaseTools: Fixed Pcd value override issue.

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / BuildClassObject.py

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index edf2bdf4b9e6b6365d6efaf84eba67b1ba3e37c9..711ba492efc4bdc9251f21fa0120fccf54467d56 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -129,6 +129,8 @@ class StructurePcd(PcdClassObject):
         self.PkgPath = ""\r
         self.DefaultValueFromDec = ""\r
         self.ValueChain = dict()\r
+        self.PcdValueFromComm = ""\r
+        self.PcdFieldValueFromComm = collections.OrderedDict({})\r
     def __repr__(self):\r
         return self.TypeName\r
 \r
@@ -188,6 +190,8 @@ class StructurePcd(PcdClassObject):
             self.PcdDefineLineNo = PcdObject.PcdDefineLineNo if PcdObject.PcdDefineLineNo else self.PcdDefineLineNo\r
             self.PkgPath = PcdObject.PkgPath if PcdObject.PkgPath else self.PkgPath\r
             self.ValueChain = PcdObject.ValueChain if PcdObject.ValueChain else self.ValueChain\r
+            self.PcdValueFromComm = PcdObject.PcdValueFromComm if PcdObject.PcdValueFromComm else self.PcdValueFromComm\r
+            self.PcdFieldValueFromComm = PcdObject.PcdFieldValueFromComm if PcdObject.PcdFieldValueFromComm else self.PcdFieldValueFromComm\r
 \r
 ## LibraryClassObject\r
 #\r