BaseTools/Build: Better DSC arch filtering

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

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index 2e6c68e33aaef2a1961c1a02b4589f9d61c88ba8..7cd00046888303f9aef35abfde1cb4348d4504ad 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -545,12 +545,6 @@ class DscBuildData(PlatformBuildClassObject):
         for Record in RecordList:\r
             DuplicatedFile = False\r
 \r
-            # process only records COMMON and self.Arch\r
-            SectionArch = Record[3].upper()\r
-            if SectionArch != 'COMMON':\r
-                if SectionArch != self.Arch:\r
-                    continue\r
-\r
             ModuleFile = PathClass(NormPath(Record[0], Macros), GlobalData.gWorkspace, Arch=self._Arch)\r
             ModuleId = Record[5]\r
             LineNo = Record[6]\r
@@ -2859,6 +2853,7 @@ class WorkspaceDatabase(object):
             MetaFile = self._FILE_PARSER_[FileType](\r
                                 FilePath, \r
                                 FileType, \r
+                                Arch,\r
                                 MetaFileStorage(self.WorkspaceDb.Cur, FilePath, FileType)\r
                                 )\r
             # alwasy do post-process, in case of macros change\r