new try

Author: ZuseZ4

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

@@ -961,48 +961,44 @@ impl Step for OmpOffload {
         };
         trace!(?profile);
 
-        let cc = if let Some(p) = &builder.build.config.llvm_offload_cc {
-            p.clone()
-        } else {
-            builder.cc(target)
-        };
-        let cxx = if let Some(p) = &builder.build.config.llvm_offload_cxx {
-            p.clone()
-        } else {
-            builder.cxx(target).unwrap()
-        };
+        //let cc = if let Some(p) = &builder.build.config.llvm_offload_cc {
+        //    //p.clone()
+        //    builder.cc(target)
+        //} else {
+        //    builder.cc(target)
+        //};
+        //let cxx = if let Some(p) = &builder.build.config.llvm_offload_cxx {
+        //    //p.clone()
+        //    builder.cxx(target).unwrap()
+        //} else {
+        //    builder.cxx(target).unwrap()
+        //};
         let root = if let Some(p) = &builder.build.config.llvm_root_offload {
             p.clone()
         } else {
             builder.llvm_out(target).join("build")
         };
+        let clang_dir = if !builder.config.llvm_clang {
+            &builder.build.config.llvm_clang_dir.unwrap()
+        } else {
+            None
+        };
 
         cfg.out_dir(&out_dir)
             .profile(profile)
             .env("LLVM_CONFIG_REAL", &host_llvm_config)
             .define("LLVM_ENABLE_ASSERTIONS", "ON")
             .define("LLVM_ENABLE_RUNTIMES", "openmp;offload")
             .define("LLVM_INCLUDE_TESTS", "OFF")
-            .define("LLVM_BUILD_TESTS", "OFF")
             .define("OFFLOAD_INCLUDE_TESTS", "OFF")
-            //.define(
-            //    "CMAKE_C_COMPILER",
-            //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang",
-            //)
-            //.define(
-            //    "CMAKE_CXX_COMPILER",
-            //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang++",
-            //)
-            .define("CMAKE_C_COMPILER", cc)
-            .define("CMAKE_CXX_COMPILER", cxx)
+            //.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_ROOT",
-            //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/build/",
-            //)
             .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.build();
 
         t!(stamp.write());

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

@@ -172,6 +172,7 @@ pub struct Config {
     pub llvm_offload_cc: Option<PathBuf>,
     pub llvm_offload_cxx: Option<PathBuf>,
     pub llvm_root_offload: Option<PathBuf>,
+    pub llvm_clang_dir: Option<PathBuf>,
     pub llvm_allow_old_toolchain: bool,
     pub llvm_polly: bool,
     pub llvm_clang: bool,
@@ -608,6 +609,7 @@ impl Config {
             offload_cc: llvm_offload_cc,
             offload_cxx: llvm_offload_cxx,
             root_offload: llvm_root_offload,
+            clang_dir: llvm_clang_dir,
             allow_old_toolchain: llvm_allow_old_toolchain,
             offload: llvm_offload,
             polly: llvm_polly,
@@ -1373,6 +1375,7 @@ impl Config {
             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

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

@@ -35,6 +35,7 @@ define_config! {
         offload_cc: Option<String> = "offload-cc",
         offload_cxx: Option<String> = "offload-cxx",
         root_offload: Option<String> = "root-offload",
+        clang_dir: Option<String> = "offload-clang-dir",
         allow_old_toolchain: Option<bool> = "allow-old-toolchain",
         offload: Option<bool> = "offload",
         polly: Option<bool> = "polly",