diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-05-23 17:02:05 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2017-07-12 11:24:49 +0800 |
| commit | c5d86dbea73356a8dcc808110d05ce56a88197bf (patch) | |
| tree | 3d1fafbf915c8722932543491032d42f81876066 | |
| parent | 68152d4678f329d5241e6aa3681f68b36422472e (diff) | |
| download | edk2-platforms-c5d86dbea73356a8dcc808110d05ce56a88197bf.tar.xz | |
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 <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 2d499388452cf8215265a0757395e7dbcdb32ea8)
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 9 |
1 files changed, 8 insertions, 1 deletions
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)
#
|