[cfe-commits] r132542 - /cfe/trunk/lib/Frontend/InitHeaderSearch.cpp

[Eric Christopher]

Author: echristo
Date: Fri Jun  3 08:24:15 2011
New Revision: 132542

URL: http://llvm.org/viewvc/llvm-project?rev=132542&view=rev
Log:
Separate out these paths a bit by architecture. There are likely other
places this is a problem.

Modified:
    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp

Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=132542&r1=132541&r2=132542&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Fri Jun  3 08:24:15 2011
@@ -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;
   }