aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2022-03-22 20:44:14 +0100
committerJakub Konka <kubkon@jakubkonka.com>2022-03-22 20:51:34 +0100
commitb74f2924102fe06addb688dc5fd039dc2756f619 (patch)
tree2458f38c54fa77f642dc41658f3cf89c7af506ea /src
parent3701697a0a586e630a2452dea29951f0051a47fd (diff)
downloadzig-b74f2924102fe06addb688dc5fd039dc2756f619.tar.gz
zig-b74f2924102fe06addb688dc5fd039dc2756f619.zip
Revert "ignore target lib dirs when invoked with -feach-lib-rpath"
This reverts commit 3701697a0a586e630a2452dea29951f0051a47fd. The commit introduced a regression when building stage2 on nixOS where the linker would fail to find relevant LLVM dynamic libraries as some search dirs were missing.
Diffstat (limited to 'src')
-rw-r--r--src/main.zig4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.zig b/src/main.zig
index d0baa1acdc..115f3748b6 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -2197,6 +2197,10 @@ fn buildOutputType(
clang_argv.appendAssumeCapacity(framework_dir);
framework_dirs.appendAssumeCapacity(framework_dir);
}
+
+ for (paths.lib_dirs.items) |lib_dir| {
+ try lib_dirs.append(lib_dir);
+ }
for (paths.rpaths.items) |rpath| {
try rpath_list.append(rpath);
}