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 /buildpipeline | |
| 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 'buildpipeline')
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json | 6 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json index 4538fb51b4..c39362c3aa 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json @@ -179,7 +179,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) -e CAC_ROOTFS_DIR=$(CAC_ROOTFS_DIR) $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", + "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", "workingFolder": "", "failOnStandardError": "false" } @@ -520,10 +520,6 @@ "ROOTFS_DIR": { "value": "/crossrootfs/$(Architecture)" }, - "CAC_ROOTFS_DIR": { - "value": "", - "allowOverride": true - }, "DockerVolumeName": { "value": "coreclr-cross-$(Build.BuildId)" }, diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index 6f6e076b43..8c618c1375 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -148,9 +148,7 @@ "DockerTag": "ubuntu-14.04-cross-e435274-20180426002420", "Architecture": "arm", "Rid": "linux", - "CrossArchitecture": "x86", - "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1", - "CAC_ROOTFS_DIR": "/crossrootfs/$(CrossArchitecture)" + "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1" }, "ReportingParameters": { "OperatingSystem": "Linux", |