From b74f2924102fe06addb688dc5fd039dc2756f619 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 22 Mar 2022 20:44:14 +0100 Subject: [PATCH] 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. --- src/main.zig | 4 ++++ 1 file changed, 4 insertions(+) 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); }