From a26f4adb1ecf767784bb4e4318093c4579fdb364 Mon Sep 17 00:00:00 2001
From: Amy Wishnousky <amyw@microsoft.com>
Date: Mon, 16 Sep 2024 18:43:53 -0700
Subject: [PATCH] Allow spectre build of debug libraries. (#4874)

---
 stl/msbuild/stl_1/xmd/dirs.proj           | 4 +---
 stl/msbuild/stl_2/xmd/dirs.proj           | 4 +---
 stl/msbuild/stl_atomic_wait/xmd/dirs.proj | 4 +---
 stl/msbuild/stl_base/dirs.proj            | 4 ++--
 stl/msbuild/stl_base/xmd/dirs.proj        | 5 +----
 stl/msbuild/stl_base/xmt/dirs.proj        | 7 ++-----
 stl/msbuild/stl_codecvt_ids/xmd/dirs.proj | 4 +---
 stl/msbuild/stl_post/xmd/dirs.proj        | 4 +---
 8 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/stl/msbuild/stl_1/xmd/dirs.proj b/stl/msbuild/stl_1/xmd/dirs.proj
index f9b3be319d..2389765745 100644
--- a/stl/msbuild/stl_1/xmd/dirs.proj
+++ b/stl/msbuild/stl_1/xmd/dirs.proj
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
+    <ItemGroup>
         <ProjectFile Include="msvcp_1_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_1_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_1_xmd_onecore.vcxproj" />
diff --git a/stl/msbuild/stl_2/xmd/dirs.proj b/stl/msbuild/stl_2/xmd/dirs.proj
index 32c9b10fc3..c8f8062d26 100644
--- a/stl/msbuild/stl_2/xmd/dirs.proj
+++ b/stl/msbuild/stl_2/xmd/dirs.proj
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
+    <ItemGroup>
         <ProjectFile Include="msvcp_2_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_2_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_2_xmd_onecore.vcxproj" />
diff --git a/stl/msbuild/stl_atomic_wait/xmd/dirs.proj b/stl/msbuild/stl_atomic_wait/xmd/dirs.proj
index 2e5c24526f..e0506689c9 100644
--- a/stl/msbuild/stl_atomic_wait/xmd/dirs.proj
+++ b/stl/msbuild/stl_atomic_wait/xmd/dirs.proj
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
+    <ItemGroup>
         <ProjectFile Include="msvcp_atomic_wait_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_atomic_wait_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_atomic_wait_xmd_onecore.vcxproj" />
diff --git a/stl/msbuild/stl_base/dirs.proj b/stl/msbuild/stl_base/dirs.proj
index a46ac76b51..5bfe0aa94f 100644
--- a/stl/msbuild/stl_base/dirs.proj
+++ b/stl/msbuild/stl_base/dirs.proj
@@ -12,8 +12,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
         <ProjectFile Condition="'$(CrtBuildMT)'  != 'false'" Include="mt\dirs.proj" />
         <ProjectFile Condition="'$(CrtBuildMT)'  != 'false'" Include="mt1\dirs.proj" />
         <ProjectFile Condition="'$(CrtBuildXMT)' != 'false'" Include="xmt\dirs.proj" />
-        <ProjectFile Condition="'$(CrtBuildXMT)' != 'false' and '$(SpectreBuildMode)' == ''" Include="xmt0\dirs.proj" />
-        <ProjectFile Condition="'$(CrtBuildXMT)' != 'false' and '$(SpectreBuildMode)' == ''" Include="xmt1\dirs.proj" />
+        <ProjectFile Condition="'$(CrtBuildXMT)' != 'false'" Include="xmt0\dirs.proj" />
+        <ProjectFile Condition="'$(CrtBuildXMT)' != 'false'" Include="xmt1\dirs.proj" />
     </ItemGroup>
 
     <Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Traversal.targets))" />
diff --git a/stl/msbuild/stl_base/xmd/dirs.proj b/stl/msbuild/stl_base/xmd/dirs.proj
index b1948b2b1f..1f5c0a0ba7 100644
--- a/stl/msbuild/stl_base/xmd/dirs.proj
+++ b/stl/msbuild/stl_base/xmd/dirs.proj
@@ -6,10 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
-        <!-- Other components in dbg and chk builds depend on msvcprtd.lib -->
+    <ItemGroup>
         <ProjectFile Include="msvcp_base_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_base_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_base_xmd_onecore.vcxproj" />
diff --git a/stl/msbuild/stl_base/xmt/dirs.proj b/stl/msbuild/stl_base/xmt/dirs.proj
index 336c1a96ed..b59f092fe5 100644
--- a/stl/msbuild/stl_base/xmt/dirs.proj
+++ b/stl/msbuild/stl_base/xmt/dirs.proj
@@ -7,11 +7,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
     <ItemGroup>
-        <ProjectFile Condition="'$(SpectreBuildMode)' == '' or
-                                '$(Configuration)' == 'chk' or
-                                '$(Configuration)' == 'dbg'"
-                     Include="libcpmt_xmt_kernel32.vcxproj" />
-        <ProjectFile Condition="'$(SpectreBuildMode)' == ''" Include="libcpmt_xmt_onecore.vcxproj" />
+        <ProjectFile Include="libcpmt_xmt_kernel32.vcxproj" />
+        <ProjectFile Include="libcpmt_xmt_onecore.vcxproj" />
     </ItemGroup>
 
     <Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Traversal.targets))" />
diff --git a/stl/msbuild/stl_codecvt_ids/xmd/dirs.proj b/stl/msbuild/stl_codecvt_ids/xmd/dirs.proj
index f87e96750c..77dc722bda 100644
--- a/stl/msbuild/stl_codecvt_ids/xmd/dirs.proj
+++ b/stl/msbuild/stl_codecvt_ids/xmd/dirs.proj
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
+    <ItemGroup>
         <ProjectFile Include="msvcp_codecvt_ids_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_codecvt_ids_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_codecvt_ids_xmd_onecore.vcxproj" />
diff --git a/stl/msbuild/stl_post/xmd/dirs.proj b/stl/msbuild/stl_post/xmd/dirs.proj
index 40f86dd45a..5b8316f58b 100644
--- a/stl/msbuild/stl_post/xmd/dirs.proj
+++ b/stl/msbuild/stl_post/xmd/dirs.proj
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
 
-    <ItemGroup Condition="('$(SpectreBuildMode)' == '' or
-                           '$(Configuration)' == 'chk' or
-                           '$(Configuration)' == 'dbg')">
+    <ItemGroup>
         <ProjectFile Include="msvcp_post_xmd_app.vcxproj" />
         <ProjectFile Include="msvcp_post_xmd_kernel32.vcxproj" />
         <ProjectFile Include="msvcp_post_xmd_onecore.vcxproj" />