BaseTools: Rationalise makefile generation

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

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index 7bd24dad42f8142694659861e03033fa082f2e32..d32178b00c936b9682b2cba5f1209e8efcb5c3e5 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -2,6 +2,7 @@
 # Create makefile for MS nmake and GNU make\r
 #\r
 # Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
@@ -106,8 +107,9 @@ class PlatformAutoGen(AutoGen):
         self.BuildDatabase = Workspace.BuildDatabase\r
         self.DscBuildDataObj = Workspace.Platform\r
 \r
-        # flag indicating if the makefile/C-code file has been created or not\r
-        self.IsMakeFileCreated  = False\r
+        # MakeFileName is used to get the Makefile name and as a flag\r
+        # indicating whether the file has been created.\r
+        self.MakeFileName = ""\r
 \r
         self._DynamicPcdList = None    # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
         self._NonDynamicPcdList = None # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
@@ -191,16 +193,15 @@ class PlatformAutoGen(AutoGen):
         self.CreateLibModuelDirs()\r
 \r
     def CreateLibModuelDirs(self):\r
-        # no need to create makefile for the platform more than once\r
-        if self.IsMakeFileCreated:\r
+        # No need to create makefile for the platform more than once.\r
+        if self.MakeFileName:\r
             return\r
 \r
         # create library/module build dirs for platform\r
         Makefile = GenMake.PlatformMakefile(self)\r
         self.LibraryBuildDirectoryList = Makefile.GetLibraryBuildDirectoryList()\r
         self.ModuleBuildDirectoryList = Makefile.GetModuleBuildDirectoryList()\r
-\r
-        self.IsMakeFileCreated = True\r
+        self.MakeFileName = Makefile.getMakefileName()\r
 \r
     @property\r
     def AllPcdList(self):\r