nixpkgs/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
Michael Roitzsch 4e89814fc6 swift: 4.1.3 -> 4.2.1
* necessary tweaks and patches to get swift 4.2.1 to build
* disabled more tests because they would require additional patching
* delete empty directories from final build output
* some minor cleanup
2018-11-01 17:53:04 +01:00

14 lines
541 B
Diff

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
@@ -565,7 +565,7 @@
// 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) {