diff mbox series

elf: Do not print the cache entry if --inhibit-cache is used

Message ID 20231017145035.3741202-1-adhemerval.zanella@linaro.org
State Accepted
Commit c06e10c8130358c409c1d2837f8171ef70169d03
Headers show
Series elf: Do not print the cache entry if --inhibit-cache is used | expand

Commit Message

Adhemerval Zanella Netto Oct. 17, 2023, 2:50 p.m. UTC 
So --help informs the correct shared library search path.
---
 elf/dl-usage.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Florian Weimer Oct. 17, 2023, 7:30 p.m. UTC | #1 
* 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
diff mbox series

Patch

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