summaryrefslogtreecommitdiffstats
path: root/PCbuild/build_ssl.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-01-20 14:05:39 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-01-20 14:05:39 (GMT)
commitcc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4 (patch)
tree060f9c5a522e01c74c0b7fc8429a0924d9fa59a9 /PCbuild/build_ssl.py
parent1b0ce8527112b997194a4e2fb9a1a850c6d73ee8 (diff)
downloadcpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.zip
cpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.tar.gz
cpython-cc0eba9d98fb67b3ea57a2edc2a0c5de38eca0d4.tar.bz2
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
Diffstat (limited to 'PCbuild/build_ssl.py')
-rw-r--r--PCbuild/build_ssl.py2
1 files changed, 2 insertions, 0 deletions
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()