From 78fb6b0e022f2e0835ca6d075f4a7a36e36d0f23 Mon Sep 17 00:00:00 2001 From: Bob Feng Date: Wed, 11 Dec 2019 19:22:21 +0800 Subject: 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 Cc: Liming Gao Cc: Steven Shi Cc: Ard Biesheuvel Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/AutoGen/ModuleAutoGen.py') diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index 74662d1b52..aad591de65 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -270,7 +270,7 @@ class ModuleAutoGen(AutoGen): # @cached_class_function def __hash__(self): - return hash((self.MetaFile, self.Arch)) + return hash((self.MetaFile, self.Arch, self.ToolChain,self.BuildTarget)) def __repr__(self): return "%s [%s]" % (self.MetaFile, self.Arch) -- cgit v1.2.3