diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-03-14 16:46:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 16:46:44 -0700 |
| commit | ffc16020fee4d866de568042fe085143332a2159 (patch) | |
| tree | 22d8c9232372987568ad1db133e80c58b7adbab0 /src/.nuget | |
| parent | 01fe8b7e9e04fdccf485f6c0399ee91dcb881c72 (diff) | |
| download | coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.gz coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.bz2 coreclr-ffc16020fee4d866de568042fe085143332a2159.zip | |
Include Linux/cross-arch components into NuGet packages (#16859)
* Add __DoCrossArchBuild settings to config.json
* HasCrossTargetComponents computes to 'true' on Linux when __DoCrossArchBuild is 1 in dir.props
* Include cross-architecture libclrjit.so crossgen into NuGet props files when HasCrossTargetComponents is 'true'
* Pass $__DoCrossArchBuild to run.sh when generating NuGet packages in build.sh
Diffstat (limited to 'src/.nuget')
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props | 1 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props index b92d11ae59..b00b1d024a 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props @@ -2,5 +2,6 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <NativeBinary Include="$(BinDir)libclrjit.so" /> + <CrossArchitectureSpecificNativeFileAndSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\libclrjit.so" /> </ItemGroup> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 69ebb80a0f..952e64550b 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -25,5 +25,6 @@ <NativeBinary Condition="'$(_PlatformDoesNotSupportCreatedump)' != 'true'" Include="$(BinDir)createdump" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> + <CrossArchitectureSpecificToolFile Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen" /> </ItemGroup> </Project> |