From 2dbe7d8d5b8408f3db2a747a4a33df80729383d2 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 2 Nov 2023 13:54:40 +0100 Subject: [PATCH] Fix invalid enabling of gcc backend in `run.sh` --- src/ci/github-actions/ci.yml | 2 +- src/ci/run.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index c90cd873c9e5..b415eb5961bb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -331,9 +331,9 @@ jobs: <<: *job-linux-4c - name: x86_64-gnu-llvm-15 - <<: *job-linux-16c env: ENABLE_GCC_CODEGEN: "1" + <<: *job-linux-16c - name: x86_64-gnu-tools <<: *job-linux-16c diff --git a/src/ci/run.sh b/src/ci/run.sh index fbdd821dd3e3..70956c63db59 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -128,10 +128,10 @@ else if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then # 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" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc" else # 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" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift" fi # We enable this for non-dist builders, since those aren't trying to produce