BaseTools:GuidedSectionTools.txt is not generated correctly

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

For LzmaCompress or BrotliCompress, the platform may use the different
options and add their batch file, such as LzmaCompressPlatform.
Then, specify it in platform.dsc [BuildOptions] to override the default
one in tools_def.txt.

*_*_*_LZMA_PATH = LzmaCompressPlatform

This override tool will be used. But, its name is not specified in the
generated GuidedSectionTools.txt.

Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

2 files changed, 5 insertions, 14 deletions

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index d32178b00c..af66c48c7d 100644
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -866,7 +866,8 @@ class PlatformAutoGen(AutoGen):
                             Value += " " + self._BuildOptionWithToolDef(RetVal)[Tool][Attr]

                         else:

                             Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr]

-

+                            Def = '_'.join([self.BuildTarget, self.ToolChain, self.Arch, Tool, Attr])

+                            self.Workspace.ToolDef.ToolsDefTxtDictionary[Def] = Value

                 if Attr == "PATH":

                     # Don't put MAKE definition in the file

                     if Tool != "MAKE":

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index d841fefdc5..bec848a7b2 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2347,7 +2347,7 @@ class Build():
                                 toolName = split[3]

                                 path = '_'.join(split[0:4]) + '_PATH'

                                 path = self.ToolDef.ToolsDefTxtDictionary[path]

-                                path = self.GetFullPathOfTool(path)

+                                path = self.GetRealPathOfTool(path)

                                 guidAttribs.append((guid, toolName, path))

 

                     # Write out GuidedSecTools.txt

@@ -2357,21 +2357,11 @@ class Build():
                         print(' '.join(guidedSectionTool), file=toolsFile)

                     toolsFile.close()

 

-    ## Returns the full path of the tool.

+    ## Returns the real path of the tool.

     #

-    def GetFullPathOfTool (self, tool):

+    def GetRealPathOfTool (self, tool):

         if os.path.exists(tool):

             return os.path.realpath(tool)

-        else:

-            # We need to search for the tool using the

-            # PATH environment variable.

-            for dirInPath in os.environ['PATH'].split(os.pathsep):

-                foundPath = os.path.join(dirInPath, tool)

-                if os.path.exists(foundPath):

-                    return os.path.realpath(foundPath)

-

-        # If the tool was not found in the path then we just return

-        # the input tool.

         return tool

 

     ## Launch the module or platform build