Add libgccjit-libs-dir config

Author: antoyo

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

@@ -51,8 +51,37 @@ impl GccOutput {
             format!("Cannot find libgccjit at {}", self.libgccjit.display())
         );
 
-        let dst = directory.join(target_filename);
+        let dst = directory.join(&target_filename);
         builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
+
+        if let Some(ref path) = builder.config.libgccjit_libs_dir {
+            let host_target = builder.config.host_target.triple;
+
+            let source = path.join(host_target);
+            let dst = directory;
+
+            let targets = builder.config.targets.iter()
+                .map(|target| target.triple)
+                .chain(std::iter::once(host_target));
+
+            for target in targets {
+                let source = source.join(target).join(&target_filename);
+                // To support symlinks in libgccjit-libs-dir, we have to resolve it first,
+                // otherwise we'd create a symlink to a symlink, which wouldn't work.
+                let actual_libgccjit_path = t!(
+                    source.canonicalize(),
+                    format!("Cannot find libgccjit at {}", self.libgccjit.display())
+                );
+                let target_dir = dst.join(target);
+                t!(
+                    std::fs::create_dir_all(&target_dir),
+                    format!("Cannot create target dir {} for libgccjit", target_dir.display())
+                );
+                let dst = target_dir.join(&target_filename);
+                builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
+            }
+        }
+
     }
 }
 

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

@@ -188,6 +188,7 @@ pub struct Config {
 
     // gcc codegen options
     pub gcc_ci_mode: GccCiMode,
+    pub libgccjit_libs_dir: Option<PathBuf>,
 
     // rust codegen options
     pub rust_optimize: RustOptimize,
@@ -620,7 +621,7 @@ impl Config {
             vendor: dist_vendor,
         } = toml.dist.unwrap_or_default();
 
-        let Gcc { download_ci_gcc: gcc_download_ci_gcc } = toml.gcc.unwrap_or_default();
+        let Gcc { download_ci_gcc: gcc_download_ci_gcc, libgccjit_libs_dir } = toml.gcc.unwrap_or_default();
 
         if rust_bootstrap_override_lld.is_some() && rust_bootstrap_override_lld_legacy.is_some() {
             panic!(
@@ -1327,6 +1328,7 @@ impl Config {
             free_args: flags_free_args,
             full_bootstrap: build_full_bootstrap.unwrap_or(false),
             gcc_ci_mode,
+            libgccjit_libs_dir,
             gdb: build_gdb.map(PathBuf::from),
             host_target,
             hosts,

src/bootstrap/src/core/config/toml/gcc.rs

@@ -15,5 +15,6 @@ define_config! {
     #[derive(Default)]
     struct Gcc {
         download_ci_gcc: Option<bool> = "download-ci-gcc",
+        libgccjit_libs_dir: Option<PathBuf> = "libgccjit-libs-dir",
     }
 }