[Python-checkins] r55934 - python/trunk/PCbuild/_ssl.mak python/trunk/PCbuild/build_ssl.py

[thomas.heller]

Author: thomas.heller
Date: Tue Jun 12 19:28:31 2007
New Revision: 55934

Modified:
   python/trunk/PCbuild/_ssl.mak
   python/trunk/PCbuild/build_ssl.py
Log:
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).


Modified: python/trunk/PCbuild/_ssl.mak
==============================================================================
--- python/trunk/PCbuild/_ssl.mak	(original)
+++ python/trunk/PCbuild/_ssl.mak	Tue Jun 12 19:28:31 2007
@@ -1,3 +1,4 @@
+EXTRA_LIBS=
 
 !IFDEF DEBUG
 SUFFIX=_d.pyd
@@ -26,12 +27,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) $(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
 <<

Modified: python/trunk/PCbuild/build_ssl.py
==============================================================================
--- python/trunk/PCbuild/build_ssl.py	(original)
+++ python/trunk/PCbuild/build_ssl.py	Tue Jun 12 19:28:31 2007
@@ -170,7 +170,7 @@
     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()