diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-05-28 01:54:31 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-05-28 01:54:31 +0000 |
| commit | eaff5fa30a2abaa71fef6a789e627e6cebe2cf07 (patch) | |
| tree | 1d2983509921ee309c6d94c8c974bbd08dce69b4 /clang/lib/Frontend/InitHeaderSearch.cpp | |
| parent | c46d8861a31b9d63bb43ab3050af1d3d9d96ddf8 (diff) | |
| download | bcm5719-llvm-eaff5fa30a2abaa71fef6a789e627e6cebe2cf07.tar.gz bcm5719-llvm-eaff5fa30a2abaa71fef6a789e627e6cebe2cf07.zip | |
Frontend: Sprinkle in some C++ header paths for ARM/Darwin. Also, don't add x86
paths on non-x86.
I really detest this file.
llvm-svn: 104921
Diffstat (limited to 'clang/lib/Frontend/InitHeaderSearch.cpp')
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index e0391c254b3..901c9f64e6c 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -559,10 +559,25 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple) { AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.3.0"); break; case llvm::Triple::Darwin: - AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", - "i686-apple-darwin10", "", "x86_64", triple); - AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0", - "i686-apple-darwin8", "", "", triple); + switch (triple.getArch()) { + default: break; + + case llvm::Triple::x86: + case llvm::Triple::x86_64: + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "i686-apple-darwin10", "", "x86_64", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0", + "i686-apple-darwin8", "", "", triple); + break; + + case llvm::Triple::arm: + case llvm::Triple::thumb: + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm-apple-darwin10", "v7", "", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm-apple-darwin10", "v6", "", triple); + break; + } break; case llvm::Triple::DragonFly: AddPath("/usr/include/c++/4.1", System, true, false, false); |
