Fix compiletest run when using GCC as backend

Author: GuillaumeGomez

src/bootstrap/src/core/build_steps/test.rs

@@ -1771,7 +1771,8 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
 
         if let Some(codegen_backend) = builder.config.codegen_backends(compiler.host).first() {
             cmd.arg("--codegen-backend").arg(codegen_backend);
-        } else if let Some(codegen_backend) = builder.config.default_codegen_backend(compiler.host) {
+        } else if let Some(codegen_backend) = builder.config.default_codegen_backend(compiler.host)
+        {
             cmd.arg("--codegen-backend").arg(&codegen_backend);
         }
 
@@ -1919,6 +1920,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
             cmd.arg(exclude);
         }
 
+        if builder.config.codegen_backends(target).first().map(|b| b.as_str()) == Some("gcc") {
+            cmd.arg("--extra-library-path");
+            cmd.arg(builder.config.libgccjit_root());
+        }
+
         // Get paths from cmd args
         let paths = match &builder.config.cmd {
             Subcommand::Test { .. } => &builder.config.paths[..],

src/tools/compiletest/src/common.rs

@@ -684,6 +684,9 @@ pub struct Config {
 
     /// Current codegen backend used.
     pub codegen_backend: CodegenBackend,
+
+    /// Only used by GCC codegen backend for now. It is used to pass `libgccjit.so`'s path.
+    pub extra_library_path: Option<Utf8PathBuf>,
 }
 
 impl Config {
@@ -787,6 +790,7 @@ impl Config {
             diff_command: Default::default(),
             minicore_path: Default::default(),
             codegen_backend: CodegenBackend::Llvm,
+            extra_library_path: None,
         }
     }
 
@@ -1151,7 +1155,11 @@ fn supported_crate_types(config: &Config) -> HashSet<String> {
 
 fn rustc_output(config: &Config, args: &[&str], envs: HashMap<String, String>) -> String {
     let mut command = Command::new(&config.rustc_path);
-    add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
+    if let Some(ref extra_lib) = config.extra_library_path {
+        add_dylib_path(&mut command, [&config.compile_lib_path, &extra_lib].iter());
+    } else {
+        add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
+    }
     command.args(&config.target_rustcflags).args(args);
     command.env("RUSTC_BOOTSTRAP", "1");
     command.envs(envs);

src/tools/compiletest/src/lib.rs

@@ -204,11 +204,12 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "only test a specific debugger in debuginfo tests",
             "gdb | lldb | cdb",
         )
+        .optopt("", "codegen-backend", "the codegen backend currently used", "CODEGEN BACKEND NAME")
         .optopt(
             "",
-            "codegen-backend",
-            "the codegen backend currently used",
-            "CODEGEN BACKEND NAME",
+            "extra-library-path",
+            "extra path to be passed into LIBRARY_PATH environment variable",
+            "library path",
         );
 
     let (argv0, args_) = args.split_first().unwrap();
@@ -466,6 +467,10 @@ pub fn parse_config(args: Vec<String>) -> Config {
         minicore_path: opt_path(matches, "minicore-path"),
 
         codegen_backend,
+
+        extra_library_path: matches
+            .opt_str("extra-library-path")
+            .map(|p| make_absolute(Utf8PathBuf::from(p))),
     }
 }