tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <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>
This commit is contained in:
Feng, Bob C 2019-09-18 14:54:34 +08:00
parent 670c903a68
commit 4747b92cab
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/AutoGen/GenMake.py
View File

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