BaseTools: Fix corner-cases of --hash feature

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1680

Re-use libraries, since they have already been hashed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Christian Rodriguez <christian.rodriguez@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index ed2368f6a3..1091366190 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -977,7 +977,7 @@ cleanlib:
     ## For creating makefile targets for dependent libraries

     def ProcessDependentLibrary(self):

         for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:

-            if not LibraryAutoGen.IsBinaryModule:

+            if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():

                 self.LibraryBuildDirectoryList.append(self.PlaceMacro(LibraryAutoGen.BuildDir, self.Macros))

 

     ## Return a list containing source file's dependencies

@@ -1480,7 +1480,7 @@ cleanlib:
     def GetLibraryBuildDirectoryList(self):

         DirList = []

         for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:

-            if not LibraryAutoGen.IsBinaryModule:

+            if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():

                 DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))

         return DirList

 

@@ -1616,7 +1616,7 @@ class TopLevelMakefile(BuildFile):
     def GetLibraryBuildDirectoryList(self):

         DirList = []

         for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:

-            if not LibraryAutoGen.IsBinaryModule:

+            if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():

                 DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))

         return DirList