From ce3eb6b2b8c6000cc656b9a593b8a70b565c1e43 Mon Sep 17 00:00:00 2001
From: Amy Wishnousky <amyw@microsoft.com>
Date: Fri, 2 Aug 2024 15:41:21 -0700
Subject: [PATCH] Allow spectre build of debug libraries.

---
 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 f9b3be319d5..2389765745e 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 32c9b10fc32..c8f8062d269 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 2e5c24526f3..e0506689c99 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 a46ac76b51f..5bfe0aa94f1 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 b1948b2b1ff..1f5c0a0ba77 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 336c1a96edb..b59f092fe5b 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 f87e96750c8..77dc722bdaa 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 40f86dd45ae..5b8316f58b7 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" />