Merge branch 'master' into consistent-testing

NilFoundation · Dec 27, 2023 · 01547b6 · 01547b6
2 parents 951c9d3 + e44dcfd
commit 01547b6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/clang/lib/Driver/ToolChains/Assigner.h b/clang/lib/Driver/ToolChains/Assigner.h
@@ -12,6 +12,7 @@
 #include "Gnu.h"
 #include "clang/Driver/Tool.h"
 #include "clang/Driver/ToolChain.h"
+#include "llvm/Support/Path.h"
 
 namespace clang {
 namespace driver {
@@ -55,6 +56,9 @@ class LLVM_LIBRARY_VISIBILITY Assigner final : public ToolChain {
       const llvm::opt::ArgList &DriverArgs,
       llvm::opt::ArgStringList &CC1Args) const override {
     addSystemInclude(DriverArgs, CC1Args, "/usr/include/zkllvm/c++");
+    SmallString<128> ResourceDirInclude(getDriver().ResourceDir);
+    llvm::sys::path::append(ResourceDirInclude, "include");
+    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
   }
 
 };