summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-10-27 20:04:12 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-10-27 20:04:12 (GMT)
commitbb4b0aa51bc361188ffeee55ee49c7878c067903 (patch)
treee9ee27abfbe8093c936be8bd54978949ba8f5bac
parent6d09f09d8b4f6e45f4b96145bc75500f590de834 (diff)
downloadcpython-bb4b0aa51bc361188ffeee55ee49c7878c067903.zip
cpython-bb4b0aa51bc361188ffeee55ee49c7878c067903.tar.gz
cpython-bb4b0aa51bc361188ffeee55ee49c7878c067903.tar.bz2
Issue 15792 Correct build options on Win64. Patch by Jeremy Kloth.
-rw-r--r--Misc/NEWS2
-rw-r--r--PC/VS9.0/x64.vsprops2
-rw-r--r--PCbuild/x64.props2
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 07aff2b..5524efa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -129,6 +129,8 @@ Build
- Issue #19356: Avoid using a C variabled named "_self", it's a reserved
word in some C compilers.
+- Issue #15792: Correct build options on Win64. Patch by Jeremy Kloth.
+
Tools/Demos
-----------
diff --git a/PC/VS9.0/x64.vsprops b/PC/VS9.0/x64.vsprops
index 9f88d44..d06f470 100644
--- a/PC/VS9.0/x64.vsprops
+++ b/PC/VS9.0/x64.vsprops
@@ -8,7 +8,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/USECL:MS_OPTERON /GS-"
+ AdditionalOptions="/GS-"
PreprocessorDefinitions="_WIN64;_M_X64"
/>
<Tool
diff --git a/PCbuild/x64.props b/PCbuild/x64.props
index 289d95b..985c0ef 100644
--- a/PCbuild/x64.props
+++ b/PCbuild/x64.props
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
<PreprocessorDefinitions>_WIN64;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>