BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate

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

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index fc2b409847be5b24a5e774a055ae6214089d4f59..dda7ed4ce79867d9131aa13930f4ec5fe7b10a9e 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -927,7 +927,10 @@ class FdfParser:
         MacroDict.update(GlobalData.gCommandLineDefines)\r
         if GlobalData.BuildOptionPcd:\r
             for Item in GlobalData.BuildOptionPcd:\r
+                if type(Item) is tuple:\r
+                    continue\r
                 PcdName, TmpValue = Item.split("=")\r
+                TmpValue = BuildOptionValue(TmpValue, {})\r
                 MacroDict[PcdName.strip()] = TmpValue\r
         # Highest priority\r
 \r