]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Fix the lib order in static_library_files.lst
authorFeng, Bob C <bob.c.feng@intel.com>
Fri, 27 Sep 2019 11:35:23 +0000 (19:35 +0800)
committerFeng, Bob C <bob.c.feng@intel.com>
Sun, 29 Sep 2019 03:59:31 +0000 (11:59 +0800)
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2216

This patch is going to fix the lib order in static_library_files.lst.
This issue is introduced by commit 673d09a2dd.
Before 673d09a2dd, build tool apply build rule for the module's library
firstly and then apply build rule for module itself. Now, build tool
apply build rule for module self and then for its library. That behavior
impact the lib order in static_library_files.lst.

This patch is to call module's LibraryAutoGenList function
explicitly, where the applying build rule action for
library is triggered.

Cc: Liming Gao <liming.gao@intel.com>
Cc: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Tested-by: dann frazier <dann.frazier@canonical.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py

index fad5bab0f24d0ec68258d81da6ae1cc76c5dce47..f0812b6887be6f9fbdb14003f2efff229633fb34 100755 (executable)
@@ -1843,7 +1843,7 @@ class ModuleAutoGen(AutoGen):
         # CanSkip uses timestamps to determine build skipping\r
         if self.CanSkip():\r
             return\r
-\r
+        self.LibraryAutoGenList\r
         AutoGenList = []\r
         IgoredAutoGenList = []\r
 \r