2018-11-01 15:28:41 +01:00
|
|
|
Only use the Nix include dirs when no sysroot is configured.
|
|
|
|
|
|
|
|
|
|
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
|
|
|
|
|
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
|
2019-04-29 17:50:46 +02:00
|
|
|
@@ -641,7 +641,7 @@
|
2018-11-01 15:28:41 +01:00
|
|
|
|
|
|
|
|
// Check for configure-time C include directories.
|
|
|
|
|
StringRef CIncludeDirs(C_INCLUDE_DIRS);
|
|
|
|
|
- if (CIncludeDirs != "") {
|
|
|
|
|
+ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
|
|
|
|
|
SmallVector<StringRef, 5> dirs;
|
|
|
|
|
CIncludeDirs.split(dirs, ":");
|
|
|
|
|
for (StringRef dir : dirs) {
|
