From 2d499388452cf8215265a0757395e7dbcdb32ea8 Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Tue, 23 May 2017 17:02:05 +0800 Subject: [PATCH] BaseTools: Fix the bug that different DSC file use same build output We meet a corner case that build different DSC file, but the DSC file use same build output directory, and the different DSC file use a same PCD with different Pcd Type, it cause build failure. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/AutoGen.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index fa6ec5608f..e89b61d19a 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -661,13 +661,20 @@ class WorkspaceAutoGen(AutoGen): self._BuildCommand = None # - # Create BuildOptions Macro & PCD metafile. + # Create BuildOptions Macro & PCD metafile, also add the Active Platform and FDF file. # content = 'gCommandLineDefines: ' content += str(GlobalData.gCommandLineDefines) content += os.linesep content += 'BuildOptionPcd: ' content += str(GlobalData.BuildOptionPcd) + content += os.linesep + content += 'Active Platform: ' + content += str(self.Platform) + content += os.linesep + if self.FdfFile: + content += 'Flash Image Definition: ' + content += str(self.FdfFile) SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False) # -- 2.39.2