diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2008-09-05 09:41:20 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2008-09-05 09:41:20 +0000 |
| commit | 121e3c207415fb4c105d690de384d8f3d49b0f2d (patch) | |
| tree | 7b293a955787cb3edacb6ea73341e46397f11f0b /lib/Driver/InitHeaderSearch.cpp | |
| parent | bdbd4620b17304040290309e0899e3d7cc15943c (diff) | |
Set different header search paths for the Windows platform.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@55832 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/InitHeaderSearch.cpp')
| -rw-r--r-- | lib/Driver/InitHeaderSearch.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/Driver/InitHeaderSearch.cpp b/lib/Driver/InitHeaderSearch.cpp index 85d44a9f38..be8a860421 100644 --- a/lib/Driver/InitHeaderSearch.cpp +++ b/lib/Driver/InitHeaderSearch.cpp @@ -19,6 +19,7 @@ #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/System/Path.h" +#include "llvm/Config/config.h" #include <vector> @@ -105,6 +106,20 @@ void InitHeaderSearch::AddEnvVarPaths(const char *Name) { void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang) { // FIXME: temporary hack: hard-coded paths. // FIXME: get these from the target? + +#ifdef LLVM_ON_WIN32 + if (Lang.CPlusPlus) { + // Mingw32 GCC version 4 + AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++", System, true, false, false); + AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/mingw32", System, true, false, false); + AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/backward", System, true, false, false); + } + + // Mingw32 GCC version 4 + AddPath("C:/mingw/lib/gcc/mingw32/4.3.0/include", System, false, false, false); + AddPath("C:/mingw/include", System, false, false, false); +#else + if (Lang.CPlusPlus) { AddPath("/usr/include/c++/4.2.1", System, true, false, false); AddPath("/usr/include/c++/4.2.1/i686-apple-darwin10", System, true, false, @@ -144,11 +159,6 @@ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang) { // DragonFly AddPath("/usr/include/c++/4.1", System, true, false, false); - - // Mingw32 GCC version 4 - AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++", System, true, false, false); - AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/mingw32", System, true, false, false); - AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/backward", System, true, false, false); } AddPath("/usr/local/include", System, false, false, false); @@ -217,13 +227,11 @@ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang) { // DragonFly AddPath("/usr/libdata/gcc41", System, true, false, false); - // Mingw32 GCC version 4 - AddPath("C:/mingw/lib/gcc/mingw32/4.3.0/include", System, false, false, false); - AddPath("C:/mingw/include", System, false, false, false); - AddPath("/usr/include", System, false, false, false); AddPath("/System/Library/Frameworks", System, true, false, true); AddPath("/Library/Frameworks", System, true, false, true); + +#endif } void InitHeaderSearch::AddDefaultEnvVarPaths(const LangOptions &Lang) { |