Fixed incremental link issue, which dependent libraries were not taken into account.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3689 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index a773e1874227cb6f7fae926f0487eb44faa59561..e79f4bd7b186e3fa28d023dd7e42267a1a6bc461 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 1fa52284381d4165ac2d3b58dee15d929af89687..bca246c3e00688af644c754b97659b5b09103d89 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -17,14 +17,14 @@
 # "*" is used to indicate that the source files will be processed at the same time.\r
 # "?" is used to indicate that the source files will be processed one by one.\r
 #\r
-# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]"\r
-#   <InputFile[.<ToolChainFamily>]>\r
+# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]" <EOL>\r
+#   <InputFile[.<ToolChainFamily>]> <EOL>\r
 #       [File-Type =] (?|*).<File-Extension> [(\n|,|;) (?|*).<File-Extension>]\r
 #\r
-#   <OutputFile[.<ToolChainFamily>]>\r
+#   <OutputFile[.<ToolChainFamily>]> <EOL>\r
 #       <FileFullPath>\r
 #\r
-#   <Command[.<ToolChainFamily>]>\r
+#   <Command[.<ToolChainFamily>]> <EOL>\r
 #       <Command1>\r
 #       [<Command2>]\r
 #\r
@@ -196,6 +196,7 @@
 [Build.Static-Library-File]\r
     <InputFile>\r
         ?.lib\r
+        $(LIBS)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r