diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 53d0039c51..21144991bf 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1236,14 +1236,10 @@ class PcdReport(object):
     def PrintStructureInfo(self, File, Struct):
         NewInfo = collections.OrderedDict()
         for Key, Value in Struct.items():
-            if Key not in NewInfo:
-                NewInfo[Key] = Value[0]
+            if Value[1] and 'build command options' in Value[1]:
+                FileWrite(File, '    *B  %-*s = %s' % (self.MaxLen + 4, '.' + Key, Value[0]))
             else:
-                del NewInfo[Key]
-                NewInfo[Key] = Value[0]
-        if NewInfo:
-            for item in NewInfo:
-                FileWrite(File, '        %-*s = %s' % (self.MaxLen + 4, '.' + item, NewInfo[item]))
+                FileWrite(File, '        %-*s = %s' % (self.MaxLen + 4, '.' + Key, Value[0]))
 
     def StrtoHex(self, value):
         try: