BaseTools: Fix build argument --pcd for flexible format bugs

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenMake.py

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 2abfdb3ac471dc243e0dbe94a0aee124077cb38d..9df5d8e2d707d946e2b983045ecb62c7d8c31be2 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -958,6 +958,8 @@ cleanlib:
                 # Use file list macro as dependency\r
                 if T.GenFileListMacro:\r
                     Deps.append("$(%s)" % T.FileListMacro)\r
+                    if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]:\r
+                        Deps.append("$(%s)" % T.ListFileMacro)\r
 \r
                 TargetDict = {\r
                     "target"    :   self.PlaceMacro(T.Target.Path, self.Macros),\r
@@ -1552,6 +1554,8 @@ class TopLevelMakefile(BuildFile):
                     if pcdValue.startswith('H'):\r
                         pcdValue = 'H' + '"' + pcdValue[1:] + '"'\r
                         ExtraOption += " --pcd " + pcdName + '=' + pcdValue\r
+                    elif pcdValue.startswith("L'"):\r
+                        ExtraOption += "--pcd " + pcdName + '=' + pcdValue\r
                     elif pcdValue.startswith('L'):\r
                         pcdValue = 'L' + '"' + pcdValue[1:] + '"'\r
                         ExtraOption += " --pcd " + pcdName + '=' + pcdValue\r