BaseTools: Fixed the bug of multi-thread genffs for override inf

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FfsInfStatement.py

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index ebb93b14c4ff7ae9ef42dd1818dd90c22e0da580..43dbd0102f5eeea631f34580c6860b098d39cbd8 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -502,7 +502,10 @@ class FfsInfStatement(FfsInfStatementClassObject):
         if self.IsBinaryModule:\r
             IsMakefile = False\r
         if IsMakefile:\r
-            MakefilePath = self.InfFileName, Arch\r
+            PathClassObj = PathClass(self.InfFileName, GenFdsGlobalVariable.WorkSpaceDir)\r
+            if self.OverrideGuid:\r
+                PathClassObj = ProcessDuplicatedInf(PathClassObj, self.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir)\r
+            MakefilePath = PathClassObj.Path, Arch\r
         if isinstance (Rule, RuleSimpleFile.RuleSimpleFile):\r
             SectionOutputList = self.__GenSimpleFileSection__(Rule, IsMakefile=IsMakefile)\r
             FfsOutput = self.__GenSimpleFileFfs__(Rule, SectionOutputList, MakefilePath=MakefilePath)\r