commit 55ab5b0799c256a719e69ce463652839135e62f7
author Eric Christopher <echristo@apple.com> Fri Jun 03 13:24:15 2011 +0000
committer Eric Christopher <echristo@apple.com> Fri Jun 03 13:24:15 2011 +0000
tree f5f074ce7cbb622ceedb7ed5aeb91521b82bbaf1
parent b3169da1e57f5feb53f4a0396bd8e7ec70309980

Separate out these paths a bit by architecture. There are likely other
places this is a problem.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@132542 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/InitHeaderSearch.cpp

diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 260d567..ad93116 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -565,12 +565,13 @@
       AddPath("/usr/include/x86_64-linux-gnu", System, false, false, false);
       AddPath("/usr/include/i686-linux-gnu/64", System, false, false, false);
       AddPath("/usr/include/i486-linux-gnu/64", System, false, false, false);
-    } else {
+    } else if (triple.getArch() == llvm::Triple::x86) {
       AddPath("/usr/include/x86_64-linux-gnu/32", System, false, false, false);
       AddPath("/usr/include/i686-linux-gnu", System, false, false, false);
       AddPath("/usr/include/i486-linux-gnu", System, false, false, false);
+    } else if (triple.getArch() == llvm::Triple::arm) {
+      AddPath("/usr/include/arm-linux-gnueabi", System, false, false, false);
     }
-    AddPath("/usr/include/arm-linux-gnueabi", System, false, false, false);
   default:
     break;
   }