================
@@ -486,8 +494,13 @@ void BareMetal::AddClangCXXStdlibIncludeArgs(const ArgList 
&DriverArgs,
   if (SysRootDir.empty())
     return;
 
+  SmallString<128> Dir(SysRootDir);
+  llvm::sys::path::append(Dir, Target, "include", "c++", "v1");
+  if (D.getVFS().exists(Dir))
+    addSystemInclude(DriverArgs, CC1Args, Dir.str());
----------------
petrhosek wrote:

We should only add this include path for libc++:
```suggestion
  switch (GetCXXStdlibType(DriverArgs)) {
  case ToolChain::CST_Libcxx: {
    SmallString<128> Dir(SysRootDir);
    llvm::sys::path::append(Dir, Target, "include", "c++", "v1");
    if (D.getVFS().exists(Dir))
      addSystemInclude(DriverArgs, CC1Args, Dir.str());
    break;
  }
  case ToolChain::CST_Libstdcxx:
    break;
  } 
```
I also think this include should be only added after we process multilibs below.

https://github.com/llvm/llvm-project/pull/165321
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to