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

diff --git a/Misc/NEWS b/Misc/NEWS
index 07aff2b89f20e007cc90d5ec38a0e839739789a1..5524efa6e9039b4e891b70f25b7c2adedb3a8dfd 100644 (file)
--- 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 9f88d443fe47b9021abdb81197bcd6e64f68d15f..d06f470cebad1814411f13dfe11ebf2b41474baa 100644 (file)
--- a/PC/VS9.0/x64.vsprops
+++ b/PC/VS9.0/x64.vsprops
@@ -8,7 +8,7 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
-               AdditionalOptions="/USECL:MS_OPTERON /GS-"\r
+               AdditionalOptions="/GS-"\r
                PreprocessorDefinitions="_WIN64;_M_X64"\r
        />\r
        <Tool\r

diff --git a/PCbuild/x64.props b/PCbuild/x64.props
index 289d95b1918d4035940025b159290bd1f994c316..985c0ef7f7f8e74a5f9d82994a052f53949a225a 100644 (file)
--- 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>