BaseTools: Create and use a shared value for 'MSFT' from DataType

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / InfBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 7c3d712efe636855b0753ed06d7a0076fa93008e..1325b4f0295a9e6da50c681708333c8706f72e94 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -252,10 +252,10 @@ class InfBuildData(ModuleBuildClassObject):
                 if self._CustomMakefile is None:\r
                     self._CustomMakefile = {}\r
                 if len(TokenList) < 2:\r
-                    self._CustomMakefile['MSFT'] = TokenList[0]\r
+                    self._CustomMakefile[TAB_COMPILER_MSFT] = TokenList[0]\r
                     self._CustomMakefile['GCC'] = TokenList[0]\r
                 else:\r
-                    if TokenList[0] not in ['MSFT', 'GCC']:\r
+                    if TokenList[0] not in [TAB_COMPILER_MSFT, 'GCC']:\r
                         EdkLogger.error("build", FORMAT_NOT_SUPPORTED,\r
                                         "No supported family [%s]" % TokenList[0],\r
                                         File=self.MetaFile, Line=Record[-1])\r
@@ -353,7 +353,7 @@ class InfBuildData(ModuleBuildClassObject):
                         else:\r
                             Tool = ToolList[0]\r
                         ToolChain = "*_*_*_%s_FLAGS" % Tool\r
-                        ToolChainFamily = 'MSFT'  # Edk.x only support MSFT tool chain\r
+                        # Edk.x only support MSFT tool chain\r
                         # ignore not replaced macros in value\r
                         ValueList = GetSplitList(' ' + Value, '/D')\r
                         Dummy = ValueList[0]\r
@@ -362,11 +362,11 @@ class InfBuildData(ModuleBuildClassObject):
                                 continue\r
                             Dummy = Dummy + ' /D ' + ValueList[Index]\r
                         Value = Dummy.strip()\r
-                        if (ToolChainFamily, ToolChain) not in self._BuildOptions:\r
-                            self._BuildOptions[ToolChainFamily, ToolChain] = Value\r
+                        if (TAB_COMPILER_MSFT, ToolChain) not in self._BuildOptions:\r
+                            self._BuildOptions[TAB_COMPILER_MSFT, ToolChain] = Value\r
                         else:\r
-                            OptionString = self._BuildOptions[ToolChainFamily, ToolChain]\r
-                            self._BuildOptions[ToolChainFamily, ToolChain] = OptionString + " " + Value\r
+                            OptionString = self._BuildOptions[TAB_COMPILER_MSFT, ToolChain]\r
+                            self._BuildOptions[TAB_COMPILER_MSFT, ToolChain] = OptionString + " " + Value\r
         # set _Header to non-None in order to avoid database re-querying\r
         self._Header_ = 'DUMMY'\r
 \r