Skip to content

Commit 530b0ca

Browse files
committed
Skip building cranelift for Fuchsia
1 parent 9df1313 commit 530b0ca

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ RUN sh /scripts/sccache.sh
5252
ENV RUST_INSTALL_DIR /checkout/obj/install
5353
RUN mkdir -p $RUST_INSTALL_DIR/etc
5454

55+
# Fuchsia only supports LLVM.
56+
ENV CODEGEN_BACKENDS llvm
57+
5558
ENV RUST_CONFIGURE_ARGS \
5659
--prefix=$RUST_INSTALL_DIR \
5760
--sysconfdir=etc \

src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ else
130130
# tests as it will fail them.
131131
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
132132
# Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
133-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc"
133+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift,gcc}"
134134
else
135135
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
136-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
136+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift}"
137137
fi
138138

139139
# We enable this for non-dist builders, since those aren't trying to produce

0 commit comments

Comments
 (0)