diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-16 16:10:24 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-18 09:36:27 +0800 |
| commit | 53c64f4286ba86788e350a82a3798e1a7abf5ef7 (patch) | |
| tree | 48f442f0c80f60ed30967f7a50677be4122a9868 /BaseTools/Source/Python/Workspace/DscBuildData.py | |
| parent | 5317e9ccafed5a031c18293caa06b660af3e9a85 (diff) | |
| download | edk2-53c64f4286ba86788e350a82a3798e1a7abf5ef7.tar.gz edk2-53c64f4286ba86788e350a82a3798e1a7abf5ef7.tar.bz2 edk2-53c64f4286ba86788e350a82a3798e1a7abf5ef7.zip | |
BaseTools: Fix a bug --pcd option enable and use the pcd in expression
the case is:
in the DSC:
[PcdsFixedAtBuild.common]
TokenSpaceGuid.TestFixedPcd|0xFFEAA000
[PcdsDynamicExDefault.common.DEFAULT]
!if TokenSpaceGuid.PcdFlag == TRUE
TokenSpaceGuid.PcdTest|TokenSpaceGuid.TestFixedPcd
!endif
Then build with --pcd TokenSpaceGuid.PcdFlag=TRUE, it report failure,
but if we build without this --pcd option, it could build success.
we found when the --pcd is enabled, the fixedatbuild pcds are not be
collected into expression to calculate.
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1256
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/Workspace/DscBuildData.py')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index 7854e71db6..e481ea4f64 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -2946,4 +2946,5 @@ class DscBuildData(PlatformBuildClassObject): ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]
PkgSet.update(ModuleData.Packages)
self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain, PkgSet)
+ self._GuidDict.update(GlobalData.gPlatformPcds)
return self._DecPcds
|