WIP

Author: Kobzol

src/bootstrap/src/core/build_steps/gcc.rs

@@ -12,6 +12,8 @@ use std::fs;
 use std::path::PathBuf;
 use std::sync::OnceLock;
 
+use build_helper::ci::CiEnv;
+
 use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
 use crate::core::config::TargetSelection;
 use crate::utils::exec::command;
@@ -112,21 +114,24 @@ impl Step for Gcc {
             return true;
         }
 
-        let deps_dir = out_dir.join("deps");
-        t!(fs::create_dir_all(&deps_dir));
-
-        // Download dependencies into the build directory, to avoid modifying the source directory
-        // The configure script should automatically find them in the build directory
-        command(root.join("contrib/download_prerequisites"))
-            // The script sadly tries to write symlinks to the source directory, even if we
-            // actually download the dependencies elsewhere.
-            // .allow_failure()
-            .current_dir(&root)
-            // .arg("--directory")
-            // .arg(&deps_dir)
-            .run(builder);
-
-        let mut configure_cmd = command(root.join("configure"));
+        // GCC creates files (e.g. symlinks to the downloaded dependencies)
+        // in the source directory, which does not work with our CI setup, where we mount
+        // source directories as read-only on Linux.
+        // Therefore, as a part of the build in CI, we first copy the whole source directory
+        // to the build directory, and perform the build from there.
+        let src_dir = if CiEnv::is_ci() {
+            let src_dir = builder.gcc_out(target).join("src");
+            if src_dir.exists() {
+                builder.remove_dir(&src_dir);
+            }
+            builder.cp_link_r(&root, &src_dir);
+            src_dir
+        } else {
+            root
+        };
+
+        command(src_dir.join("contrib/download_prerequisites")).current_dir(&src_dir).run(builder);
+        let mut configure_cmd = command(src_dir.join("configure"));
         configure_cmd
             .current_dir(&out_dir)
             .arg("--enable-host-shared")
@@ -135,20 +140,19 @@ impl Step for Gcc {
             .arg("--disable-bootstrap")
             .arg("--disable-multilib")
             .arg(format!("--prefix={}", install_dir.display()));
-        let cc = builder.build.cc(target).display().to_string();
-        // if let Some(ref ccache) = builder.build.config.ccache {
-        //     cc = format!("{ccache} {cc}");
-        // }
+        let mut cc = builder.build.cc(target).display().to_string();
+        if let Some(ref ccache) = builder.build.config.ccache {
+            cc = format!("{ccache} {cc}");
+        }
         configure_cmd.env("CC", cc);
 
         if let Ok(ref cxx) = builder.build.cxx(target) {
-            let cxx = cxx.display().to_string();
-            // if let Some(ref ccache) = builder.build.config.ccache {
-            //     cxx = format!("{ccache} {cxx}");
-            // }
+            let mut cxx = cxx.display().to_string();
+            if let Some(ref ccache) = builder.build.config.ccache {
+                cxx = format!("{ccache} {cxx}");
+            }
             configure_cmd.env("CXX", cxx);
         }
-
         configure_cmd.run(builder);
 
         command("make").current_dir(&out_dir).arg(format!("-j{}", builder.jobs())).run(builder);