Fixed EBC build error

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

2 files changed, 14 insertions, 14 deletions

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index cfd1272e83..da200b70cf 100644
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index afb8cccf94..d0a1cecbcc 100644
--- 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

 *_WINDDK3790x1830_EBC_CC_NAME       = iec.exe

 *_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe

-*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe /lib

+*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe

 *_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

 *_WINDDK3790x1830_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_WINDDK3790x1830_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_WINDDK3790x1830_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC

+*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC

 *_WINDDK3790x1830_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################

@@ -247,13 +247,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005EXP_EBC_PP_NAME       = iec.exe

 *_VS2005EXP_EBC_CC_NAME       = iec.exe

 *_VS2005EXP_EBC_DLINK_NAME    = link.exe

-*_VS2005EXP_EBC_SLINK_NAME    = link.exe /lib

+*_VS2005EXP_EBC_SLINK_NAME    = link.exe

 *_VS2005EXP_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

 *_VS2005EXP_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_VS2005EXP_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_VS2005EXP_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005EXP_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC

+*_VS2005EXP_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC

 *_VS2005EXP_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################

@@ -315,13 +315,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005STD_EBC_PP_NAME       = iec.exe

 *_VS2005STD_EBC_CC_NAME       = iec.exe

 *_VS2005STD_EBC_DLINK_NAME    = link.exe

-*_VS2005STD_EBC_SLINK_NAME    = link.exe /lib

+*_VS2005STD_EBC_SLINK_NAME    = link.exe

 *_VS2005STD_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

 *_VS2005STD_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_VS2005STD_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_VS2005STD_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005STD_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC

+*_VS2005STD_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC

 *_VS2005STD_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################

@@ -397,13 +397,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005PRO_EBC_PP_NAME     = iec.exe

 *_VS2005PRO_EBC_CC_NAME     = iec.exe

 *_VS2005PRO_EBC_DLINK_NAME  = link.exe

-*_VS2005PRO_EBC_SLINK_NAME  = link.exe /lib

+*_VS2005PRO_EBC_SLINK_NAME  = link.exe

 *_VS2005PRO_EBC_*_PATH      = C:\Program Files\Intel\EBC\Bin

 *_VS2005PRO_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_VS2005PRO_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_VS2005PRO_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005PRO_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC

+*_VS2005PRO_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC

 *_VS2005PRO_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################

@@ -499,13 +499,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005TEAMSUITE_EBC_PP_NAME     = iec.exe

 *_VS2005TEAMSUITE_EBC_CC_NAME     = iec.exe

 *_VS2005TEAMSUITE_EBC_DLINK_NAME  = link.exe

-*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe /lib

+*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe

 *_VS2005TEAMSUITE_EBC_*_PATH      = "C:\Program Files\Intel\EBC\Bin"

 *_VS2005TEAMSUITE_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_VS2005TEAMSUITE_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_VS2005TEAMSUITE_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC

+*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC

 *_VS2005TEAMSUITE_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################

@@ -622,11 +622,11 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # *_*_EBC_*_FAMILY     = INTEL

 # *_*_EBC_PP_NAME      = iec.exe

 # *_*_EBC_CC_NAME      = iec.exe

-# *_*_EBC_SLINK_NAME   = link.exe /lib

+# *_*_EBC_SLINK_NAME   = link.exe

 # *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin

 # *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib

 #

-# *_*_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC

+# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC

 # *_*_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 # *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

 # *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

@@ -834,14 +834,14 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_MYTOOLS_EBC_PP_NAME       = iec.exe

 *_MYTOOLS_EBC_CC_NAME       = iec.exe

 *_MYTOOLS_EBC_DLINK_NAME    = link.exe

-*_MYTOOLS_EBC_SLINK_NAME    = link.exe /lib

+*_MYTOOLS_EBC_SLINK_NAME    = link.exe

 

 *_MYTOOLS_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin

 *_MYTOOLS_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"

 

 *_MYTOOLS_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

 *_MYTOOLS_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h

-*_MYTOOLS_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC

+*_MYTOOLS_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC

 *_MYTOOLS_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER

 

 ##################