new try

Author: ZuseZ4

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

@@ -996,12 +996,11 @@ impl Step for OmpOffload {
             .define("OFFLOAD_INCLUDE_TESTS", "OFF")
             //.define("CMAKE_C_COMPILER", cc)
             //.define("CMAKE_CXX_COMPILER", cxx)
-            .define("Clang_DIR", "/tmp/drehwald1/prog/llvm/lib/cmake/clang")
             .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 {
-            cfg.define("CLANG_DIR", p);
+            cfg.define("Clang_DIR", p);
         }
         cfg.build();
 

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

@@ -1372,8 +1372,6 @@ impl Config {
             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_from_ci,
             llvm_ldflags,
@@ -1389,6 +1387,8 @@ impl Config {
                     .or((!llvm_from_ci && llvm_thin_lto.unwrap_or(false)).then_some(true)),
             ),
             llvm_offload: llvm_offload.unwrap_or(false),
+            llvm_offload_cc: llvm_offload_cc.map(PathBuf::from),
+            llvm_offload_cxx: llvm_offload_cxx.map(PathBuf::from),
             llvm_optimize: llvm_optimize.unwrap_or(true),
             llvm_plugins: llvm_plugin.unwrap_or(false),
             llvm_polly: llvm_polly.unwrap_or(false),