]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: init DependencyHeaderFileSet for each MakeFile class
authorFeng, Bob C <bob.c.feng@intel.com>
Wed, 18 Sep 2019 06:54:34 +0000 (14:54 +0800)
committerFeng, Bob C <bob.c.feng@intel.com>
Tue, 24 Sep 2019 02:29:09 +0000 (10:29 +0800)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2203

This patch is going to fix a regression issue that
build breaks when the custom makefile exist.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/Python/AutoGen/GenMake.py

index 2fe0e78bec7e735f2ba20d112a07610b36cfe44d..584156dab97224b42fcd01e7d0f46aa44f71a022 100755 (executable)
@@ -449,6 +449,7 @@ cleanlib:
         self.GenFfsList                 = ModuleAutoGen.GenFfsList\r
         self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR']\r
         self.FfsOutputFileList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -910,7 +911,7 @@ cleanlib:
                                     self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList\r
                                     )\r
 \r
-        self.DependencyHeaderFileSet = set()\r
+\r
         if FileDependencyDict:\r
             for Dependency in FileDependencyDict.values():\r
                 self.DependencyHeaderFileSet.update(set(Dependency))\r
@@ -1244,6 +1245,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
         BuildFile.__init__(self, ModuleAutoGen)\r
         self.PlatformInfo = self._AutoGenObject.PlatformInfo\r
         self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -1434,6 +1436,7 @@ cleanlib:
         self.ModuleBuildDirectoryList = []\r
         self.LibraryBuildDirectoryList = []\r
         self.LibraryMakeCommandList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -1539,6 +1542,7 @@ class TopLevelMakefile(BuildFile):
     def __init__(self, Workspace):\r
         BuildFile.__init__(self, Workspace)\r
         self.IntermediateDirectoryList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r