diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-02-22 19:43:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 19:43:53 +0300 |
| commit | fbc23699e8bf1b9adf377c08b35100ae9c8346a5 (patch) | |
| tree | 65e02d6e6cb24cf7dc0f5a5ea2659585f289c6c0 /src/ILCompiler.WebAssembly | |
| parent | 836dc8bcb88ea2b93a639098a39a6608e1ac198b (diff) | |
Fix binplacing of libLLVM during VS build (#5427)
Diffstat (limited to 'src/ILCompiler.WebAssembly')
| -rw-r--r-- | src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj b/src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj index fd7351639..58b4c14eb 100644 --- a/src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj +++ b/src/ILCompiler.WebAssembly/src/ILCompiler.WebAssembly.csproj @@ -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> |