From 4747b92cab69a12595fefea943e09dbb4661fec8 Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Wed, 18 Sep 2019 14:54:34 +0800 Subject: BaseTools: init DependencyHeaderFileSet for each MakeFile class 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 Cc: Steven Shi Signed-off-by: Bob Feng Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/AutoGen/GenMake.py') diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 2fe0e78bec..584156dab9 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -449,6 +449,7 @@ cleanlib: self.GenFfsList = ModuleAutoGen.GenFfsList self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR'] self.FfsOutputFileList = [] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property @@ -910,7 +911,7 @@ cleanlib: self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList ) - self.DependencyHeaderFileSet = set() + if FileDependencyDict: for Dependency in FileDependencyDict.values(): self.DependencyHeaderFileSet.update(set(Dependency)) @@ -1244,6 +1245,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\ BuildFile.__init__(self, ModuleAutoGen) self.PlatformInfo = self._AutoGenObject.PlatformInfo self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property @@ -1434,6 +1436,7 @@ cleanlib: self.ModuleBuildDirectoryList = [] self.LibraryBuildDirectoryList = [] self.LibraryMakeCommandList = [] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property @@ -1539,6 +1542,7 @@ class TopLevelMakefile(BuildFile): def __init__(self, Workspace): BuildFile.__init__(self, Workspace) self.IntermediateDirectoryList = [] + self.DependencyHeaderFileSet = set() # Compose a dict object containing information used to do replacement in template @property -- cgit v1.2.3