elf: Do not print the cache entry if --inhibit-cache is used
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
Commit Message
So --help informs the correct shared library search path.
---
elf/dl-usage.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
* 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
@@ -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);
}