Issue 15792 Correct build options on Win64. Patch by Jeremy Kloth.

tjguk · tjguk · commit bb4b0aa51bc3 · 2013-10-27T20:04:12.000Z
diff --git 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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`>`
`9`	`9`	`<Tool`
`10`	`10`	`Name="VCCLCompilerTool"`
`11`		`- AdditionalOptions="/USECL:MS_OPTERON /GS-"`
	`11`	`+ AdditionalOptions="/GS-"`
`12`	`12`	`PreprocessorDefinitions="_WIN64;_M_X64"`
`13`	`13`	`/>`
`14`	`14`	`<Tool`