From c3e2ff8f22bb6978f48ec6dbb3710984eea43ee6 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Sun, 24 Jun 2018 10:09:25 +0900 Subject: [PATCH 01/10] Create Dockerfile based on dist-various-1. --- src/ci/docker/thumb-none/Dockerfile | 127 ++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 src/ci/docker/thumb-none/Dockerfile diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile new file mode 100644 index 0000000000000..b195decfcf574 --- /dev/null +++ b/src/ci/docker/thumb-none/Dockerfile @@ -0,0 +1,127 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++ \ + make \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + xz-utils \ + zlib1g-dev \ + g++-arm-linux-gnueabi \ + g++-arm-linux-gnueabihf \ + g++-aarch64-linux-gnu \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross \ + bzip2 \ + patch \ + libssl-dev \ + pkg-config \ + gcc-arm-none-eabi \ + libnewlib-arm-none-eabi + +WORKDIR /build + +COPY dist-various-1/build-rumprun.sh /build +RUN ./build-rumprun.sh + +COPY dist-various-1/install-x86_64-redox.sh /build +RUN ./install-x86_64-redox.sh + +COPY dist-various-1/install-mips-musl.sh /build +RUN ./install-mips-musl.sh + +COPY dist-various-1/install-mipsel-musl.sh /build +RUN ./install-mipsel-musl.sh + +# Suppress some warnings in the openwrt toolchains we downloaded +ENV STAGING_DIR=/tmp + +COPY scripts/musl.sh /build +RUN env \ + CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv5te -marm -mfloat-abi=soft" \ + CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv5te -marm -mfloat-abi=soft" \ + bash musl.sh armv5te && \ + env \ + CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv6 -marm" \ + CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv6 -marm" \ + bash musl.sh arm && \ + env \ + CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm" \ + CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm" \ + bash musl.sh armhf && \ + env \ + CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \ + CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a" \ + bash musl.sh armv7 && \ + env \ + CC=aarch64-linux-gnu-gcc \ + CXX=aarch64-linux-gnu-g++ \ + bash musl.sh aarch64 && \ + env \ + CC=mips-openwrt-linux-gcc \ + CXX=mips-openwrt-linux-g++ \ + bash musl.sh mips && \ + env \ + CC=mipsel-openwrt-linux-gcc \ + CXX=mipsel-openwrt-linux-g++ \ + bash musl.sh mipsel && \ + rm -rf /build/* + +# FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently +# necessary to disambiguate the mips compiler with the mipsel compiler. We want +# to give these two wrapper scripts (currently identical ones) different hashes +# to ensure that sccache understands that they're different compilers. +RUN \ + echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ + echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh + +ENV TARGETS=asmjs-unknown-emscripten +ENV TARGETS=$TARGETS,wasm32-unknown-emscripten +ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd +ENV TARGETS=$TARGETS,mips-unknown-linux-musl +ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl +ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi +ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf +ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi +ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi +ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf +ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl +ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu +ENV TARGETS=$TARGETS,x86_64-unknown-redox +ENV TARGETS=$TARGETS,thumbv6m-none-eabi +ENV TARGETS=$TARGETS,thumbv7m-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabihf + +# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 +# get fixed and cc update +ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ + CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ + CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \ + CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \ + CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \ + CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" \ + CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \ + CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" + +ENV RUST_CONFIGURE_ARGS \ + --musl-root-armv5te=/musl-armv5te \ + --musl-root-arm=/musl-arm \ + --musl-root-armhf=/musl-armhf \ + --musl-root-armv7=/musl-armv7 \ + --musl-root-aarch64=/musl-aarch64 \ + --musl-root-mips=/musl-mips \ + --musl-root-mipsel=/musl-mipsel \ + --enable-emscripten \ + --disable-docs + +ENV SCRIPT python2.7 ../x.py dist --target $TARGETS + +# sccache +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh From 44b7a80879114ae8505bfb7ff35d00c5d0e02254 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Sun, 24 Jun 2018 13:53:43 +0900 Subject: [PATCH 02/10] Tweak to run test for thumbv7m target. --- src/ci/docker/thumb-none/Dockerfile | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile index b195decfcf574..bbf55c9ba5318 100644 --- a/src/ci/docker/thumb-none/Dockerfile +++ b/src/ci/docker/thumb-none/Dockerfile @@ -80,23 +80,25 @@ RUN \ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh -ENV TARGETS=asmjs-unknown-emscripten -ENV TARGETS=$TARGETS,wasm32-unknown-emscripten -ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd -ENV TARGETS=$TARGETS,mips-unknown-linux-musl -ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl -ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi -ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf -ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi -ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi -ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf -ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl -ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu -ENV TARGETS=$TARGETS,x86_64-unknown-redox -ENV TARGETS=$TARGETS,thumbv6m-none-eabi -ENV TARGETS=$TARGETS,thumbv7m-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabihf +# ENV TARGETS=asmjs-unknown-emscripten +# ENV TARGETS=$TARGETS,wasm32-unknown-emscripten +# ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd +# ENV TARGETS=$TARGETS,mips-unknown-linux-musl +# ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl +# ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi +# ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf +# ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi +# ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi +# ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf +# ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl +# ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu +# ENV TARGETS=$TARGETS,x86_64-unknown-redox +# ENV TARGETS=$TARGETS,thumbv6m-none-eabi +# ENV TARGETS=$TARGETS,thumbv7m-none-eabi +# ENV TARGETS=$TARGETS,thumbv7em-none-eabi +# ENV TARGETS=$TARGETS,thumbv7em-none-eabihf + +ENV TARGETS=thumbv7m-none-eabi # FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 # get fixed and cc update @@ -120,7 +122,7 @@ ENV RUST_CONFIGURE_ARGS \ --enable-emscripten \ --disable-docs -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS +ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make # sccache COPY scripts/sccache.sh /scripts/ From 990a2ff2d8de617fa0fcbc7087f72b6be43d22c0 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Sun, 24 Jun 2018 16:24:57 +0900 Subject: [PATCH 03/10] Remove the comment line that harmed. --- src/ci/docker/thumb-none/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile index bbf55c9ba5318..f3ee60c296f8d 100644 --- a/src/ci/docker/thumb-none/Dockerfile +++ b/src/ci/docker/thumb-none/Dockerfile @@ -119,7 +119,6 @@ ENV RUST_CONFIGURE_ARGS \ --musl-root-aarch64=/musl-aarch64 \ --musl-root-mips=/musl-mips \ --musl-root-mipsel=/musl-mipsel \ - --enable-emscripten \ --disable-docs ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make From bbc89b2512e8ec9ee5e16d4faa88a69aa35c6754 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 00:40:55 +0900 Subject: [PATCH 04/10] Fix rust issue #52163 --- src/bootstrap/test.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 6254f98165665..12a845c3d6db7 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -966,7 +966,9 @@ impl Step for Compiletest { builder.ensure(compile::Rustc { compiler, target }); } - builder.ensure(compile::Test { compiler, target }); + if builder.no_std(target) == Some(false) { + builder.ensure(compile::Test { compiler, target }); + } builder.ensure(native::TestHelpers { target }); builder.ensure(RemoteCopyLibs { compiler, target }); From e15c7bd0abdf73e5bfaadbd3f6e4150fda0edc56 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 00:59:49 +0900 Subject: [PATCH 05/10] Add IMAGE `thumb-none` to .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ba8a39f355c4b..e231acb86cbcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -162,6 +162,8 @@ matrix: if: branch = auto - env: IMAGE=wasm32-unknown if: branch = auto + - env: IMAGE=thumb-none + if: branch = auto - env: IMAGE=x86_64-gnu if: branch = auto - env: IMAGE=x86_64-gnu-full-bootstrap From d8e64e1540998de71020a01434859ccf4702581b Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 01:15:04 +0900 Subject: [PATCH 06/10] Adjust TARGETS. --- src/ci/docker/thumb-none/Dockerfile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile index f3ee60c296f8d..8625aae9a75fd 100644 --- a/src/ci/docker/thumb-none/Dockerfile +++ b/src/ci/docker/thumb-none/Dockerfile @@ -80,25 +80,10 @@ RUN \ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh -# ENV TARGETS=asmjs-unknown-emscripten -# ENV TARGETS=$TARGETS,wasm32-unknown-emscripten -# ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd -# ENV TARGETS=$TARGETS,mips-unknown-linux-musl -# ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl -# ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi -# ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf -# ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi -# ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi -# ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf -# ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl -# ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu -# ENV TARGETS=$TARGETS,x86_64-unknown-redox -# ENV TARGETS=$TARGETS,thumbv6m-none-eabi -# ENV TARGETS=$TARGETS,thumbv7m-none-eabi -# ENV TARGETS=$TARGETS,thumbv7em-none-eabi -# ENV TARGETS=$TARGETS,thumbv7em-none-eabihf - +# ENV TARGETS=thumbv6m-none-eabi ENV TARGETS=thumbv7m-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabihf # FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 # get fixed and cc update From 355b99f954b743a89ab3d2fa22e7a09e82ebfe72 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 01:42:53 +0900 Subject: [PATCH 07/10] Cleanup Dockerfile. --- src/ci/docker/thumb-none/Dockerfile | 79 ----------------------------- 1 file changed, 79 deletions(-) diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile index 8625aae9a75fd..354c022305e9b 100644 --- a/src/ci/docker/thumb-none/Dockerfile +++ b/src/ci/docker/thumb-none/Dockerfile @@ -12,11 +12,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ sudo \ xz-utils \ zlib1g-dev \ - g++-arm-linux-gnueabi \ - g++-arm-linux-gnueabihf \ - g++-aarch64-linux-gnu \ - gcc-sparc64-linux-gnu \ - libc6-dev-sparc64-cross \ bzip2 \ patch \ libssl-dev \ @@ -24,86 +19,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gcc-arm-none-eabi \ libnewlib-arm-none-eabi -WORKDIR /build - -COPY dist-various-1/build-rumprun.sh /build -RUN ./build-rumprun.sh - -COPY dist-various-1/install-x86_64-redox.sh /build -RUN ./install-x86_64-redox.sh - -COPY dist-various-1/install-mips-musl.sh /build -RUN ./install-mips-musl.sh - -COPY dist-various-1/install-mipsel-musl.sh /build -RUN ./install-mipsel-musl.sh - -# Suppress some warnings in the openwrt toolchains we downloaded -ENV STAGING_DIR=/tmp - -COPY scripts/musl.sh /build -RUN env \ - CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv5te -marm -mfloat-abi=soft" \ - CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv5te -marm -mfloat-abi=soft" \ - bash musl.sh armv5te && \ - env \ - CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv6 -marm" \ - CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv6 -marm" \ - bash musl.sh arm && \ - env \ - CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm" \ - CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm" \ - bash musl.sh armhf && \ - env \ - CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \ - CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a" \ - bash musl.sh armv7 && \ - env \ - CC=aarch64-linux-gnu-gcc \ - CXX=aarch64-linux-gnu-g++ \ - bash musl.sh aarch64 && \ - env \ - CC=mips-openwrt-linux-gcc \ - CXX=mips-openwrt-linux-g++ \ - bash musl.sh mips && \ - env \ - CC=mipsel-openwrt-linux-gcc \ - CXX=mipsel-openwrt-linux-g++ \ - bash musl.sh mipsel && \ - rm -rf /build/* - -# FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently -# necessary to disambiguate the mips compiler with the mipsel compiler. We want -# to give these two wrapper scripts (currently identical ones) different hashes -# to ensure that sccache understands that they're different compilers. -RUN \ - echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ - echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh - # ENV TARGETS=thumbv6m-none-eabi ENV TARGETS=thumbv7m-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabihf -# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 -# get fixed and cc update -ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ - CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ - CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \ - CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \ - CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \ - CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" \ - CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \ - CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" - ENV RUST_CONFIGURE_ARGS \ - --musl-root-armv5te=/musl-armv5te \ - --musl-root-arm=/musl-arm \ - --musl-root-armhf=/musl-armhf \ - --musl-root-armv7=/musl-armv7 \ - --musl-root-aarch64=/musl-aarch64 \ - --musl-root-mips=/musl-mips \ - --musl-root-mipsel=/musl-mipsel \ --disable-docs ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make From 0b3b8bf15c9f6be35c2f7cf1f282d81859dd05d2 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 18:14:47 +0900 Subject: [PATCH 08/10] Use `dist-various-1` Dockerfile. --- .travis.yml | 2 -- src/ci/docker/dist-various-1/Dockerfile | 9 ++++++- src/ci/docker/thumb-none/Dockerfile | 34 ------------------------- 3 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 src/ci/docker/thumb-none/Dockerfile diff --git a/.travis.yml b/.travis.yml index e231acb86cbcf..ba8a39f355c4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -162,8 +162,6 @@ matrix: if: branch = auto - env: IMAGE=wasm32-unknown if: branch = auto - - env: IMAGE=thumb-none - if: branch = auto - env: IMAGE=x86_64-gnu if: branch = auto - env: IMAGE=x86_64-gnu-full-bootstrap diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index b195decfcf574..e57209b9c65b3 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -80,6 +80,11 @@ RUN \ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh +# ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi +ENV RUN_MAKE_TARGETS=thumbv7m-none-eabi +ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi +ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf + ENV TARGETS=asmjs-unknown-emscripten ENV TARGETS=$TARGETS,wasm32-unknown-emscripten ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd @@ -120,7 +125,9 @@ ENV RUST_CONFIGURE_ARGS \ --enable-emscripten \ --disable-docs -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS +ENV SCRIPT \ + python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \ + python2.7 ../x.py dist --target $TARGETS # sccache COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile deleted file mode 100644 index 354c022305e9b..0000000000000 --- a/src/ci/docker/thumb-none/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - xz-utils \ - zlib1g-dev \ - bzip2 \ - patch \ - libssl-dev \ - pkg-config \ - gcc-arm-none-eabi \ - libnewlib-arm-none-eabi - -# ENV TARGETS=thumbv6m-none-eabi -ENV TARGETS=thumbv7m-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabihf - -ENV RUST_CONFIGURE_ARGS \ - --disable-docs - -ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make - -# sccache -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh From 76300903bc1020159297cdb929434bc488f99e85 Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Wed, 18 Jul 2018 18:17:37 +0900 Subject: [PATCH 09/10] Re-include `thumbv6m-none-eabi` to `run-make` target --- src/ci/docker/dist-various-1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index e57209b9c65b3..702f9b2886e70 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -80,8 +80,8 @@ RUN \ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh -# ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi -ENV RUN_MAKE_TARGETS=thumbv7m-none-eabi +ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi +ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7m-none-eabi ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf From 3f00b1c07b30c711777132744ec27bf8bb28609d Mon Sep 17 00:00:00 2001 From: Hideki Sekine Date: Sat, 21 Jul 2018 22:39:35 +0900 Subject: [PATCH 10/10] Treat no_std(target) == None case correctly. --- src/bootstrap/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 12a845c3d6db7..38bba40aa654b 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -966,7 +966,7 @@ impl Step for Compiletest { builder.ensure(compile::Rustc { compiler, target }); } - if builder.no_std(target) == Some(false) { + if builder.no_std(target) != Some(true) { builder.ensure(compile::Test { compiler, target }); } builder.ensure(native::TestHelpers { target });