BaseTools/PlatformAutoGen: MAKE_FLAGS and MAKE_PATH fixes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3312

Update parsing of MAKE_FLAGS in DSC [BuildOptions] sections
to split the flags into a list to be compatible with
running the make command using Popen().  Parsing MAKE_FLAGS
from tools_def.txt already uses _SplitOption().  This change
uses the same _SplitOption() method for MAKE_FLAGS from a
DSC [BuildOptions] section.

Also update the parsing of MAKE_PATH to support MAKE_PATH
from tools_def.txt or the DSC [BuildOptions] section.  MAKE_PATH
in DSC [BuildOptions] section is higher priority than MAKE_PATH
in tools_def.txt.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index 7d8e7b3c7cc1eaa207889a61fe552c9989996d6e..c16f2e4cd8b7e9a98cf6a52a42e84e827bbec596 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -1,7 +1,7 @@
 ## @file\r
 # Create makefile for MS nmake and GNU make\r
 #\r
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>\r
 #  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -805,20 +805,26 @@ class PlatformAutoGen(AutoGen):
     #\r
     @cached_property\r
     def BuildCommand(self):\r
-        RetVal = []\r
-        if "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
-            RetVal += _SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
-            if "FLAGS" in self.ToolDefinition["MAKE"]:\r
-                NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
-                if NewOption != '':\r
-                    RetVal += _SplitOption(NewOption)\r
-            if "MAKE" in self.EdkIIBuildOption:\r
-                if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
-                    Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
-                    if Flags.startswith('='):\r
-                        RetVal = [RetVal[0]] + [Flags[1:]]\r
-                    else:\r
-                        RetVal.append(Flags)\r
+        if "MAKE" in self.EdkIIBuildOption and "PATH" in self.EdkIIBuildOption["MAKE"]:\r
+            # MAKE_PATH in DSC [BuildOptions] section is higher priority\r
+            Path = self.EdkIIBuildOption["MAKE"]["PATH"]\r
+            if Path.startswith('='):\r
+                Path = Path[1:].strip()\r
+            RetVal = _SplitOption(Path)\r
+        elif "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
+            RetVal = _SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
+        else:\r
+            return []\r
+        if "MAKE" in self.ToolDefinition and "FLAGS" in self.ToolDefinition["MAKE"]:\r
+            NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
+            if NewOption != '':\r
+                RetVal += _SplitOption(NewOption)\r
+        if "MAKE" in self.EdkIIBuildOption and "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
+            Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
+            if Flags.startswith('='):\r
+                RetVal = [RetVal[0]] + _SplitOption(Flags[1:].strip())\r
+            else:\r
+                RetVal = RetVal + _SplitOption(Flags.strip())\r
         return RetVal\r
 \r
     ## Get tool chain definition\r