Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fix binplacing of libLLVM during VS build #5427

Merged
merged 1 commit into from
Feb 22, 2018
Merged

Fix binplacing of libLLVM during VS build #5427

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
1 change: 0 additions & 1 deletion dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<PropertyGroup>
<OSGroup Condition="'$(OSGroup)'==''">$(__BuildOS)</OSGroup>
<Platform Condition="'$(Platform)'==''">$(__BuildArch)</Platform>
<HostOS Condition="'$(HostOS)'==''">$(__HostOS)</HostOS>
<Configuration Condition="'$(Configuration)'==''">$(__BuildType)</Configuration>
</PropertyGroup>

Expand Down
7 changes: 4 additions & 3 deletions src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,18 @@
<Compile Include="CodeGen\NodeDataSection.cs" />
<Compile Include="CodeGen\ILToWebAssemblyImporter.cs" />
</ItemGroup>

<ItemGroup>
<Content Include="..\..\..\packages\llvmsharp\5.0.0\lib\netstandard1.1\LLVMSharp.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\osx\native\libLLVM.dylib" Condition="'$(HostOS)' == 'OSX'">
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\osx\native\libLLVM.dylib" Condition="'$(NuPkgRid)' == 'osx-x64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\linux-x64\native\libLLVM.so" Condition="'$(HostOS)' == 'Linux'">
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\linux-x64\native\libLLVM.so" Condition="'$(NuPkgRid)' == 'linux-x64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\win-x64\native\libLLVM.dll" Condition="'$(HostOS)' == 'Windows_NT'">
<Content Include="..\..\..\packages\libllvm\4.0.0\runtimes\win-x64\native\libLLVM.dll" Condition="'$(NuPkgRid)' == 'win-x64' or '$(NuPkgRid)' == ''">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
Expand Down