[Python-checkins] r53501 - python/branches/release25-maint/PCbuild/_sqlite3.vcproj python/branches/release25-maint/PCbuild/_ssl.mak python/branches/release25-maint/PCbuild/build_ssl.py python/branches/release25-maint/PCbuild/pyexpat.vcproj
martin.v.loewis
python-checkins at python.org
Sat Jan 20 14:44:50 CET 2007
Author: martin.v.loewis
Date: Sat Jan 20 14:44:50 2007
New Revision: 53501
Modified:
python/branches/release25-maint/PCbuild/_sqlite3.vcproj
python/branches/release25-maint/PCbuild/_ssl.mak
python/branches/release25-maint/PCbuild/build_ssl.py
python/branches/release25-maint/PCbuild/pyexpat.vcproj
Log:
Add /GS- flags for AMD64.
Modified: python/branches/release25-maint/PCbuild/_sqlite3.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild/_sqlite3.vcproj (original)
+++ python/branches/release25-maint/PCbuild/_sqlite3.vcproj Sat Jan 20 14:44:50 2007
@@ -193,7 +193,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
Modified: python/branches/release25-maint/PCbuild/_ssl.mak
==============================================================================
--- python/branches/release25-maint/PCbuild/_ssl.mak (original)
+++ python/branches/release25-maint/PCbuild/_ssl.mak Sat Jan 20 14:44:50 2007
@@ -31,7 +31,7 @@
_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) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
+ cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<<
/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
<<
Modified: python/branches/release25-maint/PCbuild/build_ssl.py
==============================================================================
--- python/branches/release25-maint/PCbuild/build_ssl.py (original)
+++ python/branches/release25-maint/PCbuild/build_ssl.py Sat Jan 20 14:44:50 2007
@@ -169,6 +169,8 @@
defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
if debug:
defs = defs + " " + "DEBUG=1"
+ if arch in ('amd64', 'ia64'):
+ defs = defs + " EXTRA_CFLAGS=/GS-"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand
sys.stdout.flush()
Modified: python/branches/release25-maint/PCbuild/pyexpat.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild/pyexpat.vcproj (original)
+++ python/branches/release25-maint/PCbuild/pyexpat.vcproj Sat Jan 20 14:44:50 2007
@@ -189,7 +189,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
More information about the Python-checkins
mailing list