mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify the bufferoverflowU.lib to the makefile on the command line 

(for ReleaseAMD64 builds).
This commit is contained in:
Thomas Heller 2007-06-12 17:28:31 +00:00
parent d34f9e9a54
commit 46950bae3e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PCbuild/_ssl.mak
View File

@ -1,3 +1,4 @@
EXTRA_LIBS=
!IFDEF DEBUG !IFDEF DEBUG
SUFFIX=_d.pyd SUFFIX=_d.pyd
@ -26,12 +27,12 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32
@if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl" @if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl"
cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES) cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES)
link /nologo @<< link /nologo @<<
/dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) $(EXTRA_LIBS)
<< <<
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib" @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<< link /nologo @<<
/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj
<< <<

2
PCbuild/build_ssl.py
View File

@ -170,7 +170,7 @@ def main():
if debug: if debug:
defs = defs + " " + "DEBUG=1" defs = defs + " " + "DEBUG=1"
if arch in ('amd64', 'ia64'): if arch in ('amd64', 'ia64'):
defs = defs + " EXTRA_CFLAGS=/GS-" defs = defs + " EXTRA_CFLAGS=/GS- EXTRA_LIBS=bufferoverflowU.lib"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand print "Executing:", makeCommand
sys.stdout.flush() sys.stdout.flush()