diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-12-03 14:51:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 14:51:28 -0800 |
| commit | 20c6bc555319aa635e0e490c82aebf0bb370d6c1 (patch) | |
| tree | 5a7399f6752a05abc7fdac987cabe81ca9d526ce /src/.nuget | |
| parent | a089f64a7ad55a8ce0b3203b1bf87040775dff01 (diff) | |
| download | coreclr-20c6bc555319aa635e0e490c82aebf0bb370d6c1.tar.gz coreclr-20c6bc555319aa635e0e490c82aebf0bb370d6c1.tar.bz2 coreclr-20c6bc555319aa635e0e490c82aebf0bb370d6c1.zip | |
Remove Hostx86/arm CrossGen from building and Simplify build.sh command line arguments for Linux/arm cross build (Part 2) (#21034)
* Stop building and publishing Hostx86/arm crossgen on Linux/arm
* Remove -crosscomponent argument and stop using CAC_ROOTFS_DIR environment variable in build.sh
* Simplify the related logic in build.sh
* Don't need to specify crosscomponent in tests/scripts/run-pmi-diffs.py
* Don't set CAC_ROOTFS_DIR in buildpipeline, Jenkins files and in tests/scripts/run-pmi-diffs.py
* Adjust documentation
Diffstat (limited to 'src/.nuget')
3 files changed, 0 insertions, 11 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 6414d0620f..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 @@ -3,6 +3,5 @@ <ItemGroup> <NativeBinary Include="$(BinDir)libclrjit.so" /> <CrossArchitectureSpecificNativeFileAndSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\libclrjit.so" /> - <_ObsoleteCrossArchitectureSpecificNativeFileAndSymbol Condition="'$(_HasObsoleteCrossTargetComponents)' == 'true'" Include="$(BinDir)$(_ObsoleteCrossTargetComponentFolder)\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 00277d77e7..f618a4f815 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 @@ -26,6 +26,5 @@ <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> <CrossArchitectureSpecificToolFile Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen" /> - <_ObsoleteCrossArchitectureSpecificToolFile Condition="'$(_HasObsoleteCrossTargetComponents)' == 'true'" Include="$(BinDir)$(_ObsoleteCrossTargetComponentFolder)\crossgen" /> </ItemGroup> </Project> diff --git a/src/.nuget/dir.targets b/src/.nuget/dir.targets index 20a8430f40..4d4883bf78 100644 --- a/src/.nuget/dir.targets +++ b/src/.nuget/dir.targets @@ -39,15 +39,6 @@ </NativeWithSymbolFile> </ItemGroup> - <ItemGroup Condition="'$(_HasObsoleteCrossTargetComponents)'=='true'"> - <NativeWithSymbolFile Include="@(_ObsoleteCrossArchitectureSpecificNativeFileAndSymbol)"> - <TargetPath>runtimes/$(_ObsoleteCrossTargetComponentFolder)_$(Platform)/native</TargetPath> - </NativeWithSymbolFile> - <NativeWithSymbolFile Include="@(_ObsoleteCrossArchitectureSpecificToolFile)"> - <TargetPath>tools/$(_ObsoleteCrossTargetComponentFolder)_$(Platform)</TargetPath> - </NativeWithSymbolFile> - </ItemGroup> - <ItemGroup> <!-- The symbols for these files are already in place together with respective *.ni.pdb --> <IlForCrossGenedFile Include="@(CrossGenBinary -> '%(RootDir)%(Directory)IL\%(Filename).dll')"> |