Skip to content

Allow spectre build of debug libraries #4874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Sep 17, 2024
Merged

Allow spectre build of debug libraries #4874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions stl/msbuild/stl_1/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 1 addition & 3 deletions stl/msbuild/stl_2/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Comment thread
StephanTLavavej marked this conversation as resolved.
Expand Down
4 changes: 1 addition & 3 deletions stl/msbuild/stl_atomic_wait/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions stl/msbuild/stl_base/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))" />
Expand Down
5 changes: 1 addition & 4 deletions stl/msbuild/stl_base/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
7 changes: 2 additions & 5 deletions stl/msbuild/stl_base/xmt/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))" />
Expand Down
4 changes: 1 addition & 3 deletions stl/msbuild/stl_codecvt_ids/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 1 addition & 3 deletions stl/msbuild/stl_post/xmd/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down