Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Simplify build.sh command line arguments for Linux/arm cross build (Part 1) #20836

Merged
merged 8 commits into from
Nov 13, 2018
Prev Previous commit
Next Next commit
Don't use -crosscomponent in buildpipeline
  • Loading branch information
echesakov committed Nov 6, 2018
commit 9acbe6d88c377d3154e28f284e4f7ca6fe9fa1de
6 changes: 1 addition & 5 deletions buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -506,10 +506,6 @@
"Architecture": {
"value": "arm"
},
"CrossArchBuildArgs": {
"value": "",
"allowOverride": true
},
"CrossArchBuildPackagesArgs": {
"value": "",
"allowOverride": true
Expand Down
2 changes: 0 additions & 2 deletions buildpipeline/pipelines.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@
"Architecture": "arm",
"Rid": "linux",
"CrossArchitecture": "x86",
"CrossArchBuildArgs": "crosscomponent",
"CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1",
"CAC_ROOTFS_DIR": "/crossrootfs/$(CrossArchitecture)"
},
Expand All @@ -167,7 +166,6 @@
"DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921",
"Architecture": "arm64",
"Rid": "linux",
"CrossArchBuildArgs": "crosscomponent",
"CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1"
},
"ReportingParameters": {
Expand Down