* [PATCH] elf: Do not print the cache entry if --inhibit-cache is used
@ 2023-10-17 14:50 Adhemerval Zanella
2023-10-17 19:30 ` Florian Weimer
0 siblings, 1 reply; 2+ messages in thread
From: Adhemerval Zanella @ 2023-10-17 14:50 UTC (permalink / raw)
To: libc-alpha
So --help informs the correct shared library search path.
---
elf/dl-usage.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/elf/dl-usage.c b/elf/dl-usage.c
index 98f0b0d027..04315451f2 100644
--- a/elf/dl-usage.c
+++ b/elf/dl-usage.c
@@ -99,7 +99,8 @@ print_search_path_for_help (struct dl_main_state *state)
if (map != NULL)
print_search_path_for_help_1 (map->l_runpath_dirs.dirs);
- _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE);
+ if (!GLRO(dl_inhibit_cache))
+ _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE);
print_search_path_for_help_1 (__rtld_search_dirs.dirs);
}
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] elf: Do not print the cache entry if --inhibit-cache is used
2023-10-17 14:50 [PATCH] elf: Do not print the cache entry if --inhibit-cache is used Adhemerval Zanella
@ 2023-10-17 19:30 ` Florian Weimer
0 siblings, 0 replies; 2+ messages in thread
From: Florian Weimer @ 2023-10-17 19:30 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: libc-alpha
* Adhemerval Zanella:
> So --help informs the correct shared library search path.
> ---
> elf/dl-usage.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/elf/dl-usage.c b/elf/dl-usage.c
> index 98f0b0d027..04315451f2 100644
> --- a/elf/dl-usage.c
> +++ b/elf/dl-usage.c
> @@ -99,7 +99,8 @@ print_search_path_for_help (struct dl_main_state *state)
> if (map != NULL)
> print_search_path_for_help_1 (map->l_runpath_dirs.dirs);
>
> - _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE);
> + if (!GLRO(dl_inhibit_cache))
> + _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE);
>
> print_search_path_for_help_1 (__rtld_search_dirs.dirs);
> }
Good idea, thanks.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Florian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-17 19:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-17 14:50 [PATCH] elf: Do not print the cache entry if --inhibit-cache is used Adhemerval Zanella
2023-10-17 19:30 ` Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).