# Find the contents defined in all arches and merge them to all\r
#\r
def MergeAllArches(self):\r
- for Arch in DataType.ARCH_LIST:\r
- if Arch not in self.Defines:\r
- self.Defines[Arch] = InfDefines()\r
- self.Defines[Arch].extend(self.Defines[DataType.TAB_ARCH_COMMON.upper()])\r
- self._Macro.update(self.Defines[Arch].DefinesDictionary[TAB_INF_DEFINES_MACRO])\r
+ if DataType.TAB_ARCH_COMMON.upper(self.Defines) in self.Defines:\r
+ for Arch in DataType.ARCH_LIST:\r
+ if Arch not in self.Defines:\r
+ self.Defines[Arch] = InfDefines()\r
+ self.Defines[Arch].extend(self.Defines[DataType.TAB_ARCH_COMMON.upper()])\r
+ self._Macro.update(self.Defines[Arch].DefinesDictionary[TAB_INF_DEFINES_MACRO])\r
self._Macro.update(GlobalData.gGlobalDefines)\r
# print "###",self._Macro\r
\r
- for Key in self.KeyList:\r
- for Arch in DataType.ARCH_LIST:\r
- Command = "self.Contents[Arch]." + Key + ".extend(" + "self.Contents['" + DataType.TAB_ARCH_COMMON + "']." + Key + ")"\r
- eval(Command) \r
+ if DataType.TAB_ARCH_COMMON in self.Contents:\r
+ for Key in self.KeyList:\r
+ for Arch in DataType.ARCH_LIST:\r
+ Command = "self.Contents[Arch]." + Key + ".extend(" + "self.Contents['" + DataType.TAB_ARCH_COMMON + "']." + Key + ")"\r
+ eval(Command) \r
\r
## Parse Inf file\r
#\r