From ae3f0d58858bd636c17c446dc872d1863fc24361 Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 11 Jul 2006 07:01:36 +0000
Subject: [PATCH] Fix the bug that SecMain often throw exception when
 environment variable too large. It caused by using /DEBUG in link options but
 not link "MSVCRTD.lib" library.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@870 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkNt32Pkg/Nt32.fpd              | 5 ++---
 EdkNt32Pkg/Sec/SecMain_build.xml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index d1cddbcdc2..cc257b0fc3 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -210,7 +210,7 @@
           <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>VOID*</DatumType>
           <MaxDatumSize>52</MaxDatumSize>
-          <Value>L"..\\..\\FV\\FV_RECOVERY.fd"</Value>
+          <Value>L"..\\FV\\FV_RECOVERY.fd"</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdWinNtBootMode</C_Name>
@@ -6919,8 +6919,7 @@
   </BuildOptions>
   
   <UserExtensions UserID="TianoCore" Identifier="1">
-    <mkdir dir="${FV_DIR}/../../FV"/>
-    <concat destfile="${FV_DIR}/../../FV/FV_RECOVERY.fd" binary="true" >
+    <concat destfile="${FV_DIR}/FV_RECOVERY.fd" binary="true" >
        <fileset dir="${FV_DIR}" includes="*.fv"/>
     </concat>
   </UserExtensions>
diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index f318869785..6c29d22100 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -150,7 +150,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <shellscript shell="cmd.exe" tmpsuffix=".cmd" >
             <arg line="/c"/>
             <arg line="call"/>
-            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
           </shellscript>
         </sequential>
       </OnDependency>