Fix invalid enabling of gcc backend in run.sh

rust-lang · Nov 2, 2023 · 2dbe7d8 · 2dbe7d8
1 parent a141b69
commit 2dbe7d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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