Skip to content

Commit c7a7658

Browse files
committed
Enable "full tools" option on ARM dist builders
This commit switches the `--enable-extended` option on the arm-related dist builders to `--enable-full-tools`. This alias in `config.py` corresponds to enabling a few more options: * `rust.lld = true` - this is the main purpose of this PR, to enable LLD on ARM-related platforms. This means it will effectively unlock compilation of wasm programs from an arm host. * `rust.llvm-tools = true` - it turns out that this option is largely ignored in rustbuild today. This is only read in one location to set some flags for the `llvm-tools` package, but the `llvm-tools` package is already produced on all of these builders. It's predicted that this will have no effect on build times. * `rust.codegen-backends = ['llvm']` - historically this also enabled the emscripten backend, but that has long since been removed. This brings the ARM dist builders in line with the x86_64 dist builders using this flag. The hope is that the extra time spent on CI building LLD will acceptable because it's cached by `sccache`, LLD is a relatively small C++ project, and the dist builders are all clocking well under 3 hours (the slowest of all builders) around 2 hours. There's likely some possible cleanup that can happen with these configure options since it doesn't look like they've aged too too well, but I'm hopeful that possible refactorings, if necessary, could be deferred to future PRs.
1 parent 413a129 commit c7a7658

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/ci/docker/dist-aarch64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc \
3333
ENV HOSTS=aarch64-unknown-linux-gnu
3434

3535
ENV RUST_CONFIGURE_ARGS \
36-
--enable-extended \
36+
--enable-full-tools \
3737
--enable-profiler \
3838
--disable-docs
3939
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/dist-arm-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
2727

2828
ENV HOSTS=arm-unknown-linux-gnueabi
2929

30-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
30+
ENV RUST_CONFIGURE_ARGS --enable-full-tools --disable-docs
3131
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/dist-armhf-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
2727

2828
ENV HOSTS=arm-unknown-linux-gnueabihf
2929

30-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
30+
ENV RUST_CONFIGURE_ARGS --enable-full-tools --disable-docs
3131
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/dist-armv7-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \
2727

2828
ENV HOSTS=armv7-unknown-linux-gnueabihf
2929

30-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
30+
ENV RUST_CONFIGURE_ARGS --enable-full-tools --disable-docs
3131
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

0 commit comments

Comments
 (0)