diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-11-12 17:21:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 17:21:06 -0800 |
| commit | e4bfbba75f40c3203267a235be5266d22adea6a3 (patch) | |
| tree | c8d7942bd4f345274b8cadf3045db26b51b26db2 /buildpipeline | |
| parent | ce7e79770b924c3ed4649c60074fa36c1401b4ee (diff) | |
| download | coreclr-e4bfbba75f40c3203267a235be5266d22adea6a3.tar.gz coreclr-e4bfbba75f40c3203267a235be5266d22adea6a3.tar.bz2 coreclr-e4bfbba75f40c3203267a235be5266d22adea6a3.zip | |
Simplify build.sh command line arguments for Linux/arm cross build (Part 1) (#20836)
* Don't use crosscomponent|-crosscomponent command line args in build.sh
* Don't use CROSSCOMPONENT environment variable in build.sh src/pal/tools/gen-buildsys-clang.sh
* Remove mentioning -crosscomponent from usage() in build-test.sh
* Don't use -crosscomponent in buildpipeline
* Don't use -crosscomponent in Groovy files
* Remove mentioning crosscomponent in Documentation/building/linux-instructions.md
* Stop building Hostx86/armel crossgen in build.sh
* Disable CrossGen-ing of System.Private.CoreLib on Linux/armel
Diffstat (limited to 'buildpipeline')
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json | 6 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json index ef671ffe68..4538fb51b4 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 $(CrossArchBuildArgs) -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", + "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\"", "workingFolder": "", "failOnStandardError": "false" } @@ -506,10 +506,6 @@ "Architecture": { "value": "arm" }, - "CrossArchBuildArgs": { - "value": "", - "allowOverride": true - }, "CrossArchBuildPackagesArgs": { "value": "", "allowOverride": true diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index 0cc485a403..6f6e076b43 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -149,7 +149,6 @@ "Architecture": "arm", "Rid": "linux", "CrossArchitecture": "x86", - "CrossArchBuildArgs": "crosscomponent", "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1", "CAC_ROOTFS_DIR": "/crossrootfs/$(CrossArchitecture)" }, @@ -167,7 +166,6 @@ "DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921", "Architecture": "arm64", "Rid": "linux", - "CrossArchBuildArgs": "crosscomponent", "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1" }, "ReportingParameters": { |