public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] elf: Do not print the cache entry if --inhibit-cache is used
@ 2023-10-18 11:07 Adhemerval Zanella
  0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-10-18 11:07 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c06e10c8130358c409c1d2837f8171ef70169d03

commit c06e10c8130358c409c1d2837f8171ef70169d03
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Tue Oct 17 11:50:35 2023 -0300

    elf: Do not print the cache entry if --inhibit-cache is used
    
    So --help informs the correct shared library search path.
    Reviewed-by: Florian Weimer <fweimer@redhat.com>

Diff:
---
 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);
 }

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2023-10-18 11:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-18 11:07 [glibc] elf: Do not print the cache entry if --inhibit-cache is used Adhemerval Zanella

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).