Skip building cranelift for Fuchsia
This refactors run.sh to never override an explicit $CODEGEN_BACKENDS if set in the build.
This commit is contained in:
parent
40f5e6899d
commit
53bf511af2
@ -51,6 +51,9 @@ RUN sh /scripts/sccache.sh
|
|||||||
ENV RUST_INSTALL_DIR /checkout/obj/install
|
ENV RUST_INSTALL_DIR /checkout/obj/install
|
||||||
RUN mkdir -p $RUST_INSTALL_DIR/etc
|
RUN mkdir -p $RUST_INSTALL_DIR/etc
|
||||||
|
|
||||||
|
# Fuchsia only supports LLVM.
|
||||||
|
ENV CODEGEN_BACKENDS llvm
|
||||||
|
|
||||||
ENV RUST_CONFIGURE_ARGS \
|
ENV RUST_CONFIGURE_ARGS \
|
||||||
--prefix=$RUST_INSTALL_DIR \
|
--prefix=$RUST_INSTALL_DIR \
|
||||||
--sysconfdir=etc \
|
--sysconfdir=etc \
|
||||||
|
@ -119,7 +119,8 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
|
|||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
|
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm}"
|
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm}"
|
||||||
|
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
|
||||||
else
|
else
|
||||||
# We almost always want debug assertions enabled, but sometimes this takes too
|
# We almost always want debug assertions enabled, but sometimes this takes too
|
||||||
# long for too little benefit, so we just turn them off.
|
# long for too little benefit, so we just turn them off.
|
||||||
@ -144,11 +145,12 @@ else
|
|||||||
# tests as it will fail them.
|
# tests as it will fail them.
|
||||||
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
|
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
|
||||||
# Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
|
# Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
|
||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc"
|
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift,gcc}"
|
||||||
else
|
else
|
||||||
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
|
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
|
||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
|
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift}"
|
||||||
fi
|
fi
|
||||||
|
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
|
||||||
|
|
||||||
# We enable this for non-dist builders, since those aren't trying to produce
|
# We enable this for non-dist builders, since those aren't trying to produce
|
||||||
# fresh binaries. We currently don't entirely support distributing a fresh
|
# fresh binaries. We currently don't entirely support distributing a fresh
|
||||||
|
Loading…
x
Reference in New Issue
Block a user