force download-rustc=if-unchanged for x86_64-gnu-tools runner

Signed-off-by: onur-ozkan <work@onurozkan.dev>

src/bootstrap/src/core/builder/tests.rs

@@ -241,11 +241,11 @@ fn ci_rustc_if_unchanged_logic() {
     let compiler_path = build.src.join("compiler");
     let library_path = build.src.join("compiler");
 
-    let commit = get_closest_merge_commit(
+    let commit =
-        Some(&builder.config.src),
+        get_closest_merge_commit(Some(&builder.config.src), &builder.config.git_config(), &[
-        &builder.config.git_config(),
+            compiler_path.clone(),
-        &[compiler_path.clone(), library_path.clone()],
+            library_path.clone(),
-    )
+        ])
         .unwrap();
 
     let has_changes = !helpers::git(Some(&builder.src))

src/bootstrap/src/core/config/config.rs

@@ -2736,11 +2736,10 @@ fn download_ci_rustc_commit(
 
         // Look for a version to compare to based on the current commit.
         // Only commits merged by bors will have CI artifacts.
-        let commit = get_closest_merge_commit(
+        let commit = get_closest_merge_commit(Some(&self.src), &self.git_config(), &[
-            Some(&self.src),
+            self.src.join("compiler"),
-            &self.git_config(),
+            self.src.join("library"),
-            &[self.src.join("compiler"), self.src.join("library")],
+        ])
-        )
         .unwrap();
         if commit.is_empty() {
             println!("ERROR: could not find commit hash for downloading rustc");

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

@@ -84,6 +84,7 @@ ENV RUST_CONFIGURE_ARGS \
   --enable-new-symbol-mangling
 
 ENV HOST_TARGET x86_64-unknown-linux-gnu
+ENV FORCE_CI_RUSTC 1
 
 COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
 COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

src/ci/run.sh

@@ -55,6 +55,7 @@ fi
 # If runner uses an incompatible option and `FORCE_CI_RUSTC` is not defined,
 # switch to in-tree rustc.
 if [ "$FORCE_CI_RUSTC" == "" ]; then
+    echo "debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured."
     DISABLE_CI_RUSTC_IF_INCOMPATIBLE=1
 fi