BaseTools: Fix the bug for CArray PCD override in command line

[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 ac24bd8bbe5b21f65ede162885c9d0e2999a15ab..0f3ddd5dd44498258516ec5c6aee79221b3fc98f 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -1,7 +1,7 @@
 ## @file\r
 # Create makefile for MS nmake and GNU make\r
 #\r
-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -1453,7 +1453,15 @@ class TopLevelMakefile(BuildFile):
         if GlobalData.BuildOptionPcd:\r
             for index, option in enumerate(GlobalData.gCommand):\r
                 if "--pcd" == option and GlobalData.gCommand[index+1]:\r
-                    ExtraOption += " --pcd " + GlobalData.gCommand[index+1]\r
+                    pcdName, pcdValue = GlobalData.gCommand[index+1].split('=')\r
+                    if pcdValue.startswith('H'):\r
+                        pcdValue = 'H' + '"' + pcdValue[1:] + '"'\r
+                        ExtraOption += " --pcd " + pcdName + '=' + pcdValue\r
+                    elif pcdValue.startswith('L'):\r
+                        pcdValue = 'L' + '"' + pcdValue[1:] + '"'\r
+                        ExtraOption += " --pcd " + pcdName + '=' + pcdValue\r
+                    else:\r
+                        ExtraOption += " --pcd " + GlobalData.gCommand[index+1]\r
 \r
         MakefileName = self._FILE_NAME_[self._FileType]\r
         SubBuildCommandList = []\r