fix-clang-path-and-build.diff 1.12 KB
Newer Older
1 2 3 4
---
 clang/lib/Driver/ToolChains.cpp |    2 ++
 1 file changed, 2 insertions(+)

Sylvestre Ledru's avatar
Sylvestre Ledru committed
5
Index: llvm-toolchain-snapshot_8~svn344157/clang/lib/Driver/ToolChains/Gnu.cpp
Sylvestre Ledru's avatar
Sylvestre Ledru committed
6
===================================================================
Sylvestre Ledru's avatar
Sylvestre Ledru committed
7 8 9 10 11 12 13 14 15 16 17
--- llvm-toolchain-snapshot_8~svn344157.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_8~svn344157/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -1,4 +1,5 @@
-//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ -*-===//
+//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ 
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -16,6 +17,7 @@
 #include "Arch/SystemZ.h"
Sylvestre Ledru's avatar
Sylvestre Ledru committed
18
 #include "CommonArgs.h"
19
 #include "Linux.h"
Sylvestre Ledru's avatar
Sylvestre Ledru committed
20 21 22 23
+#include "clang/Basic/Version.h"
 #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
 #include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
Sylvestre Ledru's avatar
Sylvestre Ledru committed
24
@@ -2438,6 +2440,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
25 26 27
     addLibStdCxxIncludePaths(DriverArgs, CC1Args);
     break;
   }
28
+  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
29 30
 }
 
Sylvestre Ledru's avatar
Sylvestre Ledru committed
31
 void