new try

Author: ZuseZ4

src/bootstrap/src/core/build_steps/llvm.rs

@@ -979,8 +979,11 @@ impl Step for OmpOffload {
             builder.llvm_out(target).join("build")
         };
         let clang_dir = if !builder.config.llvm_clang {
-            &builder.build.config.llvm_clang_dir.unwrap()
+            // We must have an external clang to use.
+            assert!(&builder.build.config.llvm_clang_dir.is_some());
+            builder.build.config.llvm_clang_dir.clone()
         } else {
+            // No need to specify it, since we use the in-tree clang
             None
         };
 
@@ -997,8 +1000,9 @@ impl Step for OmpOffload {
             .define("OPENMP_STANDALONE_BUILD", "ON")
             .define("LLVM_ROOT", root)
             .define("LLVM_DIR", builder.llvm_out(target).join("lib").join("cmake").join("llvm"));
-        if let Some(p) = Clang_DIR {
+        if let Some(p) = clang_dir {
             cfg.define("CLANG_DIR", p);
+        }
         cfg.build();
 
         t!(stamp.write());

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

@@ -1331,7 +1331,6 @@ impl Config {
             ehcont_guard: rust_ehcont_guard.unwrap_or(false),
             enable_bolt_settings: flags_enable_bolt_settings,
             enzyme_info,
-            offload_info,
             exec_ctx,
             explicit_stage_from_cli: flags_stage.is_some(),
             explicit_stage_from_config,
@@ -1368,14 +1367,14 @@ impl Config {
             llvm_cflags,
             llvm_clang: llvm_clang.unwrap_or(false),
             llvm_clang_cl,
+            llvm_clang_dir: llvm_clang_dir.map(PathBuf::from),
             llvm_cxxflags,
             llvm_enable_warnings: llvm_enable_warnings.unwrap_or(false),
             llvm_enzyme: llvm_enzyme.unwrap_or(false),
             llvm_experimental_targets,
             llvm_offload_cc: llvm_offload_cc.map(PathBuf::from),
             llvm_offload_cxx: llvm_offload_cxx.map(PathBuf::from),
             llvm_root_offload: llvm_root_offload.map(PathBuf::from),
-            llvm_clang_dir: llvm_clang_dir.map(PathBuf::from),
             llvm_from_ci,
             llvm_ldflags,
             llvm_libunwind_default: rust_llvm_libunwind
@@ -1412,6 +1411,7 @@ impl Config {
             musl_root: rust_musl_root.map(PathBuf::from),
             ninja_in_file: llvm_ninja.unwrap_or(true),
             nodejs: build_nodejs.map(PathBuf::from),
+            offload_info,
             omit_git_hash,
             on_fail: flags_on_fail,
             optimized_compiler_builtins,

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

@@ -114,9 +114,10 @@ pub fn check_incompatible_options_for_ci_llvm(
         ldflags,
         use_libcxx,
         use_linker,
-        offload_cc,
-        offload_cxx,
-        root_offload,
+        offload_cc: _,
+        offload_cxx: _,
+        root_offload: _,
+        clang_dir: _,
         allow_old_toolchain,
         offload,
         polly,