BaseTools:Override the MAKE_FLAGS by BuildOptions in DSC

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

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 405bfa145a22b66251b5ec92c0a2d0da8095f6cc..1787decd1d9e8127fc0f70149a63d3feebad302e 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1907,6 +1907,13 @@ class PlatformAutoGen(AutoGen):
                     NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
                     if NewOption != '':\r
                         self._BuildCommand += 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
+                            self._BuildCommand = [self._BuildCommand[0]] + [Flags[1:]]\r
+                        else:\r
+                            self._BuildCommand += [Flags]\r
         return self._BuildCommand\r
 \r
     ## Get tool chain definition\r