mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 06:47:09 +03:00
41 lines
1.0 KiB
Diff
41 lines
1.0 KiB
Diff
|
diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
|
||
|
|
--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200
|
||
|
|
+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100
|
||
|
|
@@ -480,6 +480,7 @@
|
||
|
|
AddPath(*i, System, false, false, false);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if 0
|
||
|
|
switch (os) {
|
||
|
|
case llvm::Triple::Win32: {
|
||
|
|
@@ -593,7 +593,9 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
if ( os != llvm::Triple::RTEMS )
|
||
|
|
AddPath("/usr/include", System, false, false, false);
|
||
|
|
+#endif
|
||
|
|
+ AddPath(C_INCLUDE_PATH, System, false, false, false);
|
||
|
|
}
|
||
|
|
|
||
|
|
void InitHeaderSearch::
|
||
|
|
@@ -550,6 +553,7 @@
|
||
|
|
triple);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
+#if 0
|
||
|
|
// FIXME: temporary hack: hard-coded paths.
|
||
|
|
|
||
|
|
if (triple.isOSDarwin()) {
|
||
|
|
@@ -769,6 +773,10 @@
|
||
|
|
default:
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
+ AddGnuCPlusPlusIncludePaths(
|
||
|
|
+ CPP_INCLUDE_PATH,
|
||
|
|
+ CPP_HOST, "", "", triple);
|
||
|
|
}
|
||
|
|
|
||
|
|
void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,
|