From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 11 Jun 2021 21:16:50 +0000 (-0700)
Subject: bpo-44381: Windows build now allows enabling control flow guard (GH-26645)
X-Git-Tag: v3.9.6~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9580d3894ad158ae909e7573a02dcd087de0b673;p=thirdparty%2FPython%2Fcpython.git

bpo-44381: Windows build now allows enabling control flow guard (GH-26645)

(cherry picked from commit 5af56c6f2a0d11df37fed7ecaaf321cf6926ba13)
---

diff --git a/Misc/NEWS.d/next/Build/2021-06-10-18-08-44.bpo-44381.Xpc1iX.rst b/Misc/NEWS.d/next/Build/2021-06-10-18-08-44.bpo-44381.Xpc1iX.rst
new file mode 100644
index 000000000000..002112c4b556
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-06-10-18-08-44.bpo-44381.Xpc1iX.rst
@@ -0,0 +1,2 @@
+The Windows build now accepts :envvar:`EnableControlFlowGuard` set to
+``guard`` to enable CFG.
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 98e5ab030321..2b4be392da47 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -44,11 +44,11 @@
       <CompileAs>Default</CompileAs>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OnlyExplicitInline</InlineFunctionExpansion>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OnlyExplicitInline</InlineFunctionExpansion>
+      <ControlFlowGuard Condition="$(EnableControlFlowGuard) != ''">$(EnableControlFlowGuard)</ControlFlowGuard>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ClCompile Condition="$(Configuration) == 'Debug'">
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>