From bdfc6244aea6624126186fa92bd23dc2aaf580e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Mon, 5 Apr 2021 08:26:46 +0100 Subject: link mode: always include explicit -L dirs in ldpathenv. --- src/logic/slbt_exec_link.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index 97e3276..09a3928 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -494,9 +494,15 @@ static int slbt_exec_link_adjust_argument_vector( if ((fd = openat(fdcwd,ldir,O_DIRECTORY,0)) < 0) *mark = 0; - else + else { close(fd); + if ((ret = slbt_emit_fdwrap_amend_dl_path( + dctx,ectx,depsmeta,"%s",ldir)) < 0) { + return ret; + } + } + *aarg++ = *carg++; } else if (**carg == '-') { -- cgit v1.2.3