Commit 0533fb8b3f81051a5d18c6438b3f8fbb4bc6c84d
Committed by
Tom Rini
1 parent
0810a5a925
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
travis: Switch to i386 version toolchain for x86
Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
.travis.yml
... | ... | @@ -68,9 +68,9 @@ |
68 | 68 | - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi |
69 | 69 | - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi |
70 | 70 | - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi |
71 | - - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then | |
72 | - ./tools/buildman/buildman --fetch-arch x86_64; | |
73 | - echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-7.3.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; | |
71 | + - if [[ "${TOOLCHAIN}" == *i386* ]]; then | |
72 | + ./tools/buildman/buildman --fetch-arch i386; | |
73 | + echo -e "\n[toolchain-alias]\nx86 = i386" >> ~/.buildman; | |
74 | 74 | fi |
75 | 75 | - if [[ "${TOOLCHAIN}" == arc ]]; then |
76 | 76 | wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.09-release/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz && |
... | ... | @@ -208,7 +208,7 @@ |
208 | 208 | - name: "buildman sandbox x86" |
209 | 209 | env: |
210 | 210 | - BUILDMAN="sandbox x86" |
211 | - TOOLCHAIN="x86_64" | |
211 | + TOOLCHAIN="i386" | |
212 | 212 | - name: "buildman kirkwood (excluding openrd)" |
213 | 213 | env: |
214 | 214 | - BUILDMAN="kirkwood -x openrd" |
215 | 215 | |
216 | 216 | |
... | ... | @@ -321,19 +321,19 @@ |
321 | 321 | env: |
322 | 322 | - TEST_PY_BD="sandbox" |
323 | 323 | BUILDMAN="^sandbox$" |
324 | - TOOLCHAIN="x86_64" | |
324 | + TOOLCHAIN="i386" | |
325 | 325 | - name: "test/py sandbox_spl" |
326 | 326 | env: |
327 | 327 | - TEST_PY_BD="sandbox_spl" |
328 | 328 | TEST_PY_TEST_SPEC="test_ofplatdata" |
329 | 329 | BUILDMAN="^sandbox$" |
330 | - TOOLCHAIN="x86_64" | |
330 | + TOOLCHAIN="i386" | |
331 | 331 | TEST_PY_TOOLS="yes" |
332 | 332 | - name: "test/py sandbox_flattree" |
333 | 333 | env: |
334 | 334 | - TEST_PY_BD="sandbox_flattree" |
335 | 335 | BUILDMAN="^sandbox_flattree$" |
336 | - TOOLCHAIN="x86_64" | |
336 | + TOOLCHAIN="i386" | |
337 | 337 | - name: "test/py vexpress_ca15_tc2" |
338 | 338 | env: |
339 | 339 | - TEST_PY_BD="vexpress_ca15_tc2" |
... | ... | @@ -406,7 +406,7 @@ |
406 | 406 | TEST_PY_TEST_SPEC="not sleep" |
407 | 407 | QEMU_TARGET="i386-softmmu" |
408 | 408 | BUILDMAN="^qemu-x86$" |
409 | - TOOLCHAIN="x86_64" | |
409 | + TOOLCHAIN="i386" | |
410 | 410 | BUILD_ROM="yes" |
411 | 411 | - name: "test/py zynq_zc702" |
412 | 412 | env: |