diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-11-02 13:54:40 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-11-02 21:03:27 +0100 |
| commit | 2dbe7d8d5b8408f3db2a747a4a33df80729383d2 (patch) | |
| tree | c15df2f9f99f09314f130ba028e36d95549f9ce7 | |
| parent | a141b6975b44f9cd3bc2bbc752885ffe630e4bce (diff) | |
| download | rust-2dbe7d8d5b8408f3db2a747a4a33df80729383d2.tar.gz rust-2dbe7d8d5b8408f3db2a747a4a33df80729383d2.zip | |
Fix invalid enabling of gcc backend in `run.sh`
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 | ||||
| -rwxr-xr-x | 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 c90cd873c9e..b415eb5961b 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 fbdd821dd3e..70956c63db5 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 |