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

BaseTools: Fix build failure when multiple build targets given 

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2371

This patch is to fix a regression issue that build fails
if multiple build targets given.

Two changes cause this regression issue.
One is AutoGen object __hash__ function only
hash file path and arch, missing ToolChain and build target.

The other is changing the multiple-thread-genfds function as default
build behavior. To generate the genffs command to Makefile, there
is a global data set is used, GenFdsGlobalVariable, which cause build
tool use the data of first build-target build in
the second build-target build.

Signed-off-by: Bob Feng <bob.c.feng@intel.com>

Cc: Liming Gao <liming.gao@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Bob Feng 2019-12-11 19:22:21 +08:00 committed by mergify[bot]
parent bfb141cf19
commit 78fb6b0e02
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
View File

@ -270,7 +270,7 @@ class ModuleAutoGen(AutoGen):
# #
@cached_class_function @cached_class_function
def __hash__(self): def __hash__(self):
return hash((self.MetaFile, self.Arch)) return hash((self.MetaFile, self.Arch, self.ToolChain,self.BuildTarget))
def __repr__(self): def __repr__(self):
return "%s [%s]" % (self.MetaFile, self.Arch) return "%s [%s]" % (self.MetaFile, self.Arch)

2
BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
View File

@ -148,7 +148,7 @@ class PlatformAutoGen(AutoGen):
# #
@cached_class_function @cached_class_function
def __hash__(self): def __hash__(self):
return hash((self.MetaFile, self.Arch)) return hash((self.MetaFile, self.Arch,self.ToolChain,self.BuildTarget))
@cached_class_function @cached_class_function
def __repr__(self): def __repr__(self):
return "%s [%s]" % (self.MetaFile, self.Arch) return "%s [%s]" % (self.MetaFile, self.Arch)

2
BaseTools/Source/Python/build/build.py
View File

@ -58,6 +58,7 @@ from AutoGen.DataPipe import MemoryDataPipe
from AutoGen.ModuleAutoGenHelper import WorkSpaceInfo, PlatformInfo from AutoGen.ModuleAutoGenHelper import WorkSpaceInfo, PlatformInfo
from GenFds.FdfParser import FdfParser from GenFds.FdfParser import FdfParser
from AutoGen.IncludesAutoGen import IncludesAutoGen from AutoGen.IncludesAutoGen import IncludesAutoGen
from GenFds.GenFds import resetFdsGlobalVariable
## standard targets of build command ## standard targets of build command
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run'] gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']
@ -2207,6 +2208,7 @@ class Build():
GlobalData.gGlobalDefines['TARGET'] = BuildTarget GlobalData.gGlobalDefines['TARGET'] = BuildTarget
index = 0 index = 0
for ToolChain in self.ToolChainList: for ToolChain in self.ToolChainList:
resetFdsGlobalVariable()
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain
GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index] GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]