diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-05-23 17:02:05 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-05-25 11:32:40 +0800 |
| commit | d3b84e02eb7f6a6f18786b563ab34dd33026d5c3 (patch) | |
| tree | b91d0e58aba43dbeac001b4b680eb742e0b36ae8 | |
| parent | 60ea76dd3ac00d49c0c35f4e62c0d25dc7541a79 (diff) | |
| download | edk2-d3b84e02eb7f6a6f18786b563ab34dd33026d5c3.tar.gz | |
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)
#
|