alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch

14 lines
541 B
Diff
Raw Normal View History

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 14:28:41 +00: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
swift: 4.2.3 -> 5.0.1 update Swift * new tweaks to the build process are mostly documented inline * the swiftc wrapper needs the linker path for libicu * some older tweaks could be removed * remove fuzz from patches by updating line numbers * one build fix to libdispatch has been filed upstream
2019-04-29 16:50:46 +01:00
@@ -641,7 +641,7 @@
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 14:28:41 +00: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) {
Copy permalink