Fixed EBC link issue

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index d0a1cecbccaab57b24617514b3f1b45945f90893..afb8cccf9436a742506d54cfb97cc3b6911f0a4c 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -179,13 +179,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_WINDDK3790x1830_EBC_PP_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_CC_NAME       = iec.exe\r
 *_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe\r
-*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe\r
+*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe /lib\r
 *_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
 *_WINDDK3790x1830_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_WINDDK3790x1830_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_WINDDK3790x1830_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC\r
 *_WINDDK3790x1830_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
@@ -247,13 +247,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005EXP_EBC_PP_NAME       = iec.exe\r
 *_VS2005EXP_EBC_CC_NAME       = iec.exe\r
 *_VS2005EXP_EBC_DLINK_NAME    = link.exe\r
-*_VS2005EXP_EBC_SLINK_NAME    = link.exe\r
+*_VS2005EXP_EBC_SLINK_NAME    = link.exe /lib\r
 *_VS2005EXP_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
 *_VS2005EXP_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_VS2005EXP_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_VS2005EXP_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005EXP_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005EXP_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC\r
 *_VS2005EXP_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
@@ -315,13 +315,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005STD_EBC_PP_NAME       = iec.exe\r
 *_VS2005STD_EBC_CC_NAME       = iec.exe\r
 *_VS2005STD_EBC_DLINK_NAME    = link.exe\r
-*_VS2005STD_EBC_SLINK_NAME    = link.exe\r
+*_VS2005STD_EBC_SLINK_NAME    = link.exe /lib\r
 *_VS2005STD_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
 *_VS2005STD_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_VS2005STD_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_VS2005STD_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005STD_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005STD_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC\r
 *_VS2005STD_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
@@ -397,13 +397,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005PRO_EBC_PP_NAME     = iec.exe\r
 *_VS2005PRO_EBC_CC_NAME     = iec.exe\r
 *_VS2005PRO_EBC_DLINK_NAME  = link.exe\r
-*_VS2005PRO_EBC_SLINK_NAME  = link.exe\r
+*_VS2005PRO_EBC_SLINK_NAME  = link.exe /lib\r
 *_VS2005PRO_EBC_*_PATH      = C:\Program Files\Intel\EBC\Bin\r
 *_VS2005PRO_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_VS2005PRO_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_VS2005PRO_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005PRO_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005PRO_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC\r
 *_VS2005PRO_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
@@ -499,13 +499,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005TEAMSUITE_EBC_PP_NAME     = iec.exe\r
 *_VS2005TEAMSUITE_EBC_CC_NAME     = iec.exe\r
 *_VS2005TEAMSUITE_EBC_DLINK_NAME  = link.exe\r
-*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe\r
+*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe /lib\r
 *_VS2005TEAMSUITE_EBC_*_PATH      = "C:\Program Files\Intel\EBC\Bin"\r
 *_VS2005TEAMSUITE_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_VS2005TEAMSUITE_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_VS2005TEAMSUITE_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
+*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC\r
 *_VS2005TEAMSUITE_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r
@@ -622,11 +622,11 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # *_*_EBC_*_FAMILY     = INTEL\r
 # *_*_EBC_PP_NAME      = iec.exe\r
 # *_*_EBC_CC_NAME      = iec.exe\r
-# *_*_EBC_SLINK_NAME   = link.exe\r
+# *_*_EBC_SLINK_NAME   = link.exe /lib\r
 # *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
 # *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib\r
 #\r
-# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+# *_*_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC\r
 # *_*_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 # *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 # *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
@@ -834,14 +834,14 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_MYTOOLS_EBC_PP_NAME       = iec.exe\r
 *_MYTOOLS_EBC_CC_NAME       = iec.exe\r
 *_MYTOOLS_EBC_DLINK_NAME    = link.exe\r
-*_MYTOOLS_EBC_SLINK_NAME    = link.exe\r
+*_MYTOOLS_EBC_SLINK_NAME    = link.exe /lib\r
 \r
 *_MYTOOLS_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin\r
 *_MYTOOLS_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"\r
 \r
 *_MYTOOLS_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 *_MYTOOLS_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-*_MYTOOLS_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+*_MYTOOLS_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC\r
 *_MYTOOLS_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
 ##################\r