2012-10-08 06:57:39 +01:00
|
|
|
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
|
|
|
|
|
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
|
|
|
|
|
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400
|
|
|
|
|
@@ -2146,9 +2146,6 @@
|
2011-12-19 12:48:09 +00:00
|
|
|
if (DriverArgs.hasArg(options::OPT_nostdinc))
|
|
|
|
|
return;
|
2011-10-18 17:37:28 +01:00
|
|
|
|
2012-10-08 06:57:39 +01:00
|
|
|
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
|
|
|
|
|
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
|
|
|
|
|
-
|
2011-12-19 12:48:09 +00:00
|
|
|
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
|
|
|
|
|
llvm::sys::Path P(D.ResourceDir);
|
|
|
|
|
P.appendComponent("include");
|
2012-10-08 06:57:39 +01:00
|
|
|
@@ -2264,6 +2261,7 @@
|
2011-12-19 12:48:09 +00:00
|
|
|
return;
|
2011-02-05 15:45:02 +00:00
|
|
|
|
2012-10-08 06:57:39 +01:00
|
|
|
// Check if libc++ has been enabled and provide its include paths if so.
|
|
|
|
|
+ // !!! Will need to modify this if/when nixpkgs uses libc++
|
|
|
|
|
if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
|
|
|
|
|
// libc++ is always installed at a fixed path on Linux currently.
|
|
|
|
|
addSystemInclude(DriverArgs, CC1Args,
|
