Skip to content

Clean up crossgen2.csproj file #47502

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
AntonLapounov merged 1 commit into from
Jan 27, 2021
Merged

Clean up crossgen2.csproj file #47502

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
19 changes: 9 additions & 10 deletions src/coreclr/tools/aot/crossgen2/crossgen2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@

<PropertyGroup>
<CrossHostArch></CrossHostArch>
<CrossHostArch Condition="'$(TargetArchitecture)' == 'arm64' and '$(BuildArchitecture)' == 'x64'">x64</CrossHostArch>
<CrossHostArch Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' == 'x64'">x64</CrossHostArch>
<CrossHostArch Condition="'$(TargetArchitecture)' == 'x86' and '$(BuildArchitecture)' == 'x64'">x64</CrossHostArch>
<CrossHostArch Condition="'$(TargetArchitecture)' != 'x64' and '$(BuildArchitecture)' == 'x64'">x64</CrossHostArch>

<TargetOSComponent>unix</TargetOSComponent>
<TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
Expand All @@ -70,13 +68,13 @@
</PropertyGroup>

<ItemGroup>
<Content Include="$(RuntimeBinDir)\$(JitInterfaceLibraryName)"
<Content Include="$(RuntimeBinDir)$(JitInterfaceLibraryName)"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
Link="%(FileName)%(Extension)"
/>

<Content Include="$(RuntimeBinDir)\$(NativeArchFolder)$(LibPrefix)clrjit_*_$(TargetArchitecture)$(LibSuffix)"
<Content Include="$(RuntimeBinDir)$(NativeArchFolder)$(LibPrefix)clrjit_*_$(TargetArchitecture)$(LibSuffix)"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
Link="%(FileName)%(Extension)"
Expand All @@ -86,7 +84,8 @@
<!-- On windows we can re-use the clrjit.dll produced in the build for aot compilation. On Linux
this works at runtime, but makes it difficult to debug the jit.-->
<ItemGroup Condition="'$(TargetOS)' == 'windows'">
<Content Include="$(RuntimeBinDir)\$(NativeArchFolder)$(LibPrefix)clrjit$(LibSuffix)"
<Content Remove="$(RuntimeBinDir)$(LibPrefix)clrjit_$(TargetSpec)$(LibSuffix)" />
<Content Include="$(RuntimeBinDir)$(NativeArchFolder)$(LibPrefix)clrjit$(LibSuffix)"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
Link="$(LibPrefix)clrjit_$(TargetSpec)$(LibSuffix)"
Expand All @@ -96,13 +95,13 @@
<Target Name="CreateCrossTargetingPackage" AfterTargets="Build" Condition="'$(CrossHostArch)' != ''">

<PropertyGroup>
<CrossPackageFolder>$(RuntimeBinDir)\$(CrossHostArch)\crossgen2</CrossPackageFolder>
<CrossPackageFolder>$(RuntimeBinDir)$(CrossHostArch)\crossgen2</CrossPackageFolder>
</PropertyGroup>

<ItemGroup>
<PackageFile Include="$(RuntimeBinDir)\crossgen2\*"
Exclude="$(RuntimeBinDir)\crossgen2\$(JitInterfaceLibraryName);$(RuntimeBinDir)\crossgen2\$(LibPrefix)clrjit_*$(LibSuffix)" />
<PackageFile Include="$(RuntimeBinDir)\$(CrossHostArch)\$(LibPrefix)jitinterface_$(CrossHostArch)$(LibSuffix)" />
<PackageFile Include="$(RuntimeBinDir)crossgen2\*"
Exclude="$(RuntimeBinDir)crossgen2\$(JitInterfaceLibraryName);$(RuntimeBinDir)crossgen2\$(LibPrefix)clrjit_*$(LibSuffix)" />
<PackageFile Include="$(RuntimeBinDir)$(CrossHostArch)\$(LibPrefix)jitinterface_$(CrossHostArch)$(LibSuffix)" />
</ItemGroup>

<MakeDir Directories="$(CrossPackageFolder)" />
Expand Down