]> granicus.if.org Git - python/commitdiff
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
authorThomas Heller <theller@ctypes.org>
Tue, 12 Jun 2007 16:08:27 +0000 (16:08 +0000)
committerThomas Heller <theller@ctypes.org>
Tue, 12 Jun 2007 16:08:27 +0000 (16:08 +0000)
right thing to do?).

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

PCbuild/_ssl.mak
PCbuild/build_ssl.bat

index 5641c6a72db1623869fd1bc5fb36cf5a30202746..d6eb7b01232c17559aa4d9c6ccb7680f3d29bc36 100644 (file)
@@ -26,12 +26,12 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32
        @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
 <<
index 82572ed18ae53c82a307c6cdf03db55fac7649d6..9aad44127baf158a6ab92fc1146fb7df7d2b8e63 100644 (file)
@@ -1,3 +1,5 @@
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL\r
+\r
 @echo off\r
 if not defined HOST_PYTHON (\r
   if %1 EQU Debug (\r