BaseTools:fixed the incorrect autogen makefile which cause build failure.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenMake.py

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 7562dc68b36c31e5f0d0c4029607b17a4e8e3114..3e770ad7c425d1e6b8db3f49d4bccd9ed4905a3c 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -429,7 +429,7 @@ cleanlib:
         self.CommonFileDependency = []\r
         self.FileListMacros = {}\r
         self.ListFileMacros = {}\r
-        self.ObjTargetDict = {}\r
+        self.ObjTargetDict = OrderedDict()\r
         self.FileCache = {}\r
         self.LibraryBuildCommandList = []\r
         self.LibraryFileList = []\r
@@ -943,6 +943,12 @@ cleanlib:
             DependencyDict[File] = list(NewDepSet)\r
 \r
         # Convert target description object to target string in makefile\r
+        if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and TAB_C_CODE_FILE in self._AutoGenObject.Targets:\r
+            for T in self._AutoGenObject.Targets[TAB_C_CODE_FILE]:\r
+                NewFile = self.PlaceMacro(str(T), self.Macros)\r
+                if not self.ObjTargetDict.get(T.Target.SubDir):\r
+                    self.ObjTargetDict[T.Target.SubDir] = set()\r
+                self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
         for Type in self._AutoGenObject.Targets:\r
             for T in self._AutoGenObject.Targets[Type]:\r
                 # Generate related macros if needed\r
@@ -952,13 +958,6 @@ cleanlib:
                     self.ListFileMacros[T.ListFileMacro] = []\r
                 if T.GenIncListFile and T.IncListFileMacro not in self.ListFileMacros:\r
                     self.ListFileMacros[T.IncListFileMacro] = []\r
-                if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Type == TAB_C_CODE_FILE:\r
-                    NewFile = self.PlaceMacro(str(T), self.Macros)\r
-                    if self.ObjTargetDict.get(T.Target.SubDir):\r
-                        self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
-                    else:\r
-                        self.ObjTargetDict[T.Target.SubDir] = set()\r
-                        self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
 \r
                 Deps = []\r
                 CCodeDeps = []\r