[Python-checkins] cpython: Issue 15792 Correct build options on Win64. Patch by Jeremy Kloth.

[tim.golden]

http://hg.python.org/cpython/rev/7c46b1b239fe
changeset:   86695:7c46b1b239fe
user:        Tim Golden <mail at timgolden.me.uk>
date:        Sun Oct 27 20:04:12 2013 +0000
summary:
  Issue 15792 Correct build options on Win64. Patch by Jeremy Kloth.

files:
  Misc/NEWS            |  2 ++
  PC/VS9.0/x64.vsprops |  2 +-
  PCbuild/x64.props    |  2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -129,6 +129,8 @@
 - 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
--- 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
--- 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>

-- 
Repository URL: http://hg.python.org/cpython