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 /tests/scripts | |
| 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 'tests/scripts')
| -rw-r--r-- | tests/scripts/run-pmi-diffs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/scripts/run-pmi-diffs.py b/tests/scripts/run-pmi-diffs.py index 6033ed9042..acf15fcc40 100644 --- a/tests/scripts/run-pmi-diffs.py +++ b/tests/scripts/run-pmi-diffs.py @@ -44,7 +44,7 @@ Jitutils_url = 'https://github.com/dotnet/jitutils.git' # The Docker file and possibly options should be hoisted out to a text file to be shared between scripts. Docker_name_arm32 = 'microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-e435274-20180426002420' -Docker_opts_arm32 = '-e ROOTFS_DIR=/crossrootfs/arm -e CAC_ROOTFS_DIR=/crossrootfs/x86' +Docker_opts_arm32 = '-e ROOTFS_DIR=/crossrootfs/arm' Docker_name_arm64 = 'microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921' Docker_opts_arm64 = '-e ROOTFS_DIR=/crossrootfs/arm64' @@ -313,7 +313,7 @@ def baseline_build(): dockerOpts = Docker_opts_arm64 dockerCmd = 'docker run -i --rm -v %s:%s -w %s %s %s ' % (baseCoreClrPath, baseCoreClrPath, baseCoreClrPath, dockerOpts, dockerFile) - buildOpts = 'cross crosscomponent' + buildOpts = 'cross' scriptPath = baseCoreClrPath # Build a checked baseline jit |