Skip to content

Commit 53bf511

Browse files
committed
Skip building cranelift for Fuchsia
This refactors run.sh to never override an explicit $CODEGEN_BACKENDS if set in the build.
1 parent 40f5e68 commit 53bf511

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

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

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

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

src/ci/run.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
119119
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
120120
fi
121121

122-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm}"
122+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm}"
123+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
123124
else
124125
# We almost always want debug assertions enabled, but sometimes this takes too
125126
# long for too little benefit, so we just turn them off.
@@ -144,11 +145,12 @@ else
144145
# tests as it will fail them.
145146
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
146147
# Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
147-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc"
148+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift,gcc}"
148149
else
149150
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
150-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
151+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift}"
151152
fi
153+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
152154

153155
# We enable this for non-dist builders, since those aren't trying to produce
154156
# fresh binaries. We currently don't entirely support distributing a fresh

0 commit comments

Comments
 (0)