Skip to content

Commit b1217d1

Browse files
committed
explicitely add llvm Include dir to overwrite out-of-tree clang's default
1 parent 2271b97 commit b1217d1

File tree

1 file changed

+5
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,10 @@ fn configure_cmake(
779779
if builder.config.llvm_clang_cl.is_some() {
780780
cflags.push(format!(" --target={target}"));
781781
}
782+
// Manuel
783+
let base = builder.llvm_out(target).join("include");
784+
let inc_dir = base.display();
785+
cflags.push(format!(" -I {inc_dir}"));
782786
cfg.define("CMAKE_C_FLAGS", cflags);
783787
let mut cxxflags: OsString = builder
784788
.cc_handled_clags(target, CLang::Cxx)
@@ -792,6 +796,7 @@ fn configure_cmake(
792796
.collect::<Vec<String>>()
793797
.join(" ")
794798
.into();
799+
cxxflags.push(format!(" -I {inc_dir}"));
795800
if let Some(ref s) = builder.config.llvm_cxxflags {
796801
cxxflags.push(" ");
797802
cxxflags.push(s);

0 commit comments

Comments
 (0)