[Python-checkins] r55930 - python/trunk/PCbuild/_ssl.mak python/trunk/PCbuild/build_ssl.bat

[thomas.heller]

Author: thomas.heller
Date: Tue Jun 12 18:08:27 2007
New Revision: 55930

Modified:
   python/trunk/PCbuild/_ssl.mak
   python/trunk/PCbuild/build_ssl.bat
Log:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).

Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.


Modified: python/trunk/PCbuild/_ssl.mak
==============================================================================
--- python/trunk/PCbuild/_ssl.mak	(original)
+++ python/trunk/PCbuild/_ssl.mak	Tue Jun 12 18:08:27 2007
@@ -26,12 +26,12 @@
 	@if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl"
 	cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES)
 	link /nologo @<<
-             /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS)
+             /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) bufferoverflowU.lib
 <<
 
 _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
     @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
     cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) 
     link /nologo @<<
-	/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
+	/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj bufferoverflowU.lib
 <<

Modified: python/trunk/PCbuild/build_ssl.bat
==============================================================================
--- python/trunk/PCbuild/build_ssl.bat	(original)
+++ python/trunk/PCbuild/build_ssl.bat	Tue Jun 12 18:08:27 2007
@@ -1,3 +1,5 @@
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
+
 @echo off
 if not defined HOST_PYTHON (
   if %1 EQU Debug (