Add new --with-llvm-sysroot test option

Author: GuillaumeGomez

.github/workflows/ci.yml

@@ -37,6 +37,10 @@ jobs:
           "--test-successful-rustc --nb-parts 2 --current-part 1",
           "--projects",
           "--gcc-asm-tests",
+          # With the LLVM sysroot now.
+          "--test-successful-rustc --nb-parts 2 --current-part 0 --with-llvm-sysroot",
+          "--test-successful-rustc --nb-parts 2 --current-part 1 --with-llvm-sysroot",
+          "--projects --with-llvm-sysroot",
         ]
 
     steps:

build_system/src/config.rs

@@ -122,6 +122,7 @@ pub struct ConfigInfo {
     pub no_default_features: bool,
     pub backend: Option<String>,
     pub features: Vec<String>,
+    pub use_llvm_sysroot: bool,
 }
 
 impl ConfigInfo {
@@ -394,11 +395,10 @@ impl ConfigInfo {
             // by its build system directly so no need to set it ourselves.
             rustflags.push(format!("-Zcodegen-backend={backend}"));
         } else {
-            rustflags.extend_from_slice(&[
-                "--sysroot".to_string(),
-                self.sysroot_path.clone(),
-                format!("-Zcodegen-backend={}", self.cg_backend_path),
-            ]);
+            if !self.use_llvm_sysroot {
+                rustflags.extend_from_slice(&["--sysroot".to_string(), self.sysroot_path.clone()]);
+            }
+            rustflags.push(format!("-Zcodegen-backend={}", self.cg_backend_path));
         }
 
         // This environment variable is useful in case we want to change options of rustc commands.

build_system/src/test.rs

@@ -70,6 +70,7 @@ fn show_usage() {
 
     --features [arg]       : Add a new feature [arg]
     --use-system-gcc       : Use system installed libgccjit
+    --use-llvm-sysroot     : Use LLVM sysroot instead of the one compiled with `cg_gcc`
     --build-only           : Only build rustc_codegen_gcc then exits
     --nb-parts             : Used to split rustc_tests (for CI needs)
     --current-part         : Used with `--nb-parts`, allows you to specify which parts to test"#
@@ -132,6 +133,9 @@ impl TestArg {
                 "--keep-lto-tests" => {
                     test_arg.keep_lto_tests = true;
                 }
+                "--use-llvm-sysroot" => {
+                    test_arg.config_info.use_llvm_sysroot = true;
+                }
                 "--sysroot-features" => match args.next() {
                     Some(feature) if !feature.is_empty() => {
                         test_arg.sysroot_features.push(feature);
@@ -283,6 +287,9 @@ fn mini_tests(env: &Env, args: &TestArg) -> Result<(), String> {
 fn build_sysroot(env: &Env, args: &TestArg) -> Result<(), String> {
     // FIXME: create a function "display_if_not_quiet" or something along the line.
     println!("[BUILD] sysroot");
+    if !args.config_info.use_llvm_sysroot {
+        println!("`--use-llvm-sysroot` option was used, skipping sysroot build");
+    }
     let mut config = args.config_info.clone();
     config.features.extend(args.sysroot_features.iter().cloned());
     build::build_sysroot(env, &config)?;
@@ -630,8 +637,12 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
         if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
 
     let rustc_args = format!(
-        "-Zpanic-abort-tests -Zcodegen-backend={codegen_backend_path} --sysroot {} -Cpanic=abort{extra}",
-        args.config_info.sysroot_path
+        "-Zpanic-abort-tests -Zcodegen-backend={codegen_backend_path}{} -Cpanic=abort{extra}",
+        if args.config_info.use_llvm_sysroot {
+            String::new()
+        } else {
+            format!(" --sysroot {}", args.config_info.sysroot_path)
+        },
     );
 
     run_command_with_env(
@@ -1124,10 +1135,14 @@ where
         if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
 
     let rustc_args = format!(
-        "{test_flags} -Zcodegen-backend={backend} --sysroot {sysroot}{extra}",
+        "{test_flags} -Zcodegen-backend={backend}{sysroot}{extra}",
         test_flags = env.get("TEST_FLAGS").unwrap_or(&String::new()),
         backend = args.config_info.cg_backend_path,
-        sysroot = args.config_info.sysroot_path,
+        sysroot = if args.config_info.use_llvm_sysroot {
+            String::new()
+        } else {
+            format!(" --sysroot {}", args.config_info.sysroot_path)
+        },
         extra = extra,
     );