diff options
| author | Thomas Heller <theller@ctypes.org> | 2007-06-12 17:28:31 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2007-06-12 17:28:31 (GMT) |
| commit | 46950bae3e747af4f8c9d75d64a9895c09ea0bdc (patch) | |
| tree | f61fa8d4a748f94005d4501f410760cc9d5f1571 /PCbuild | |
| parent | d34f9e9a544cddd7f7ac4a8dd8e23a369b5c77a2 (diff) | |
| download | cpython-46950bae3e747af4f8c9d75d64a9895c09ea0bdc.zip cpython-46950bae3e747af4f8c9d75d64a9895c09ea0bdc.tar.gz cpython-46950bae3e747af4f8c9d75d64a9895c09ea0bdc.tar.bz2 | |
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_ssl.mak | 5 | ||||
| -rw-r--r-- | PCbuild/build_ssl.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak index 5641c6a..3420ef1 100644 --- a/PCbuild/_ssl.mak +++ b/PCbuild/_ssl.mak @@ -1,3 +1,4 @@ +EXTRA_LIBS= !IFDEF DEBUG 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" 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) $(EXTRA_LIBS) << _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) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj << diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 2a31ca4..96809b3 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -170,7 +170,7 @@ def main(): if debug: defs = defs + " " + "DEBUG=1" 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 print "Executing:", makeCommand sys.stdout.flush() |