diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-01-20 13:44:50 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-01-20 13:44:50 (GMT) |
| commit | 9f6ce2b2ff713a989e10a55e65634bcc7c6c2561 (patch) | |
| tree | 0215aa2af12ab4b44d3d81ce8ae7c61d266146f4 /PCbuild | |
| parent | 3b77d3d9a728b029657489bdc9a0c688ebcceaee (diff) | |
| download | cpython-9f6ce2b2ff713a989e10a55e65634bcc7c6c2561.zip cpython-9f6ce2b2ff713a989e10a55e65634bcc7c6c2561.tar.gz cpython-9f6ce2b2ff713a989e10a55e65634bcc7c6c2561.tar.bz2 | |
Add /GS- flags for AMD64.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_sqlite3.vcproj | 2 | ||||
| -rw-r--r-- | PCbuild/_ssl.mak | 2 | ||||
| -rw-r--r-- | PCbuild/build_ssl.py | 2 | ||||
| -rw-r--r-- | PCbuild/pyexpat.vcproj | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj index a0408a6..e0402f9 100644 --- a/PCbuild/_sqlite3.vcproj +++ b/PCbuild/_sqlite3.vcproj @@ -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" diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak index 2623d27..5641c6a 100644 --- a/PCbuild/_ssl.mak +++ b/PCbuild/_ssl.mak @@ -31,7 +31,7 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32 _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 << diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 5ab3449..2a31ca4 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -169,6 +169,8 @@ def main(): 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() diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj index c2b8824..2657e3b 100644 --- a/PCbuild/pyexpat.vcproj +++ b/PCbuild/pyexpat.vcproj @@ -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" |