about summary refs log tree commit diff
path: root/elf/dl-main.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-10-08 10:57:10 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-10-08 14:29:49 +0200
commit27316f4a23efdc90bdfe4569a6c4b7e27941606e (patch)
tree89958b354e27b96a2dda1315e347b3a548c2be9f /elf/dl-main.h
parent9590a71adcf134c77f2d0f5711b0d6ab1b4193e6 (diff)
downloadglibc-27316f4a23efdc90bdfe4569a6c4b7e27941606e.tar.gz
glibc-27316f4a23efdc90bdfe4569a6c4b7e27941606e.tar.xz
glibc-27316f4a23efdc90bdfe4569a6c4b7e27941606e.zip
elf: Record whether paths come from LD_LIBRARY_PATH or --library-path
This allows more precise LD_DEBUG diagnostics.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-main.h')
-rw-r--r--elf/dl-main.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/elf/dl-main.h b/elf/dl-main.h
index b01f433f9c..79c9c40056 100644
--- a/elf/dl-main.h
+++ b/elf/dl-main.h
@@ -74,6 +74,9 @@ struct dl_main_state
   /* The library search path.  */
   const char *library_path;
 
+  /* Where library_path comes from.  LD_LIBRARY_PATH or --library-path.  */
+  const char *library_path_source;
+
   /* The list preloaded objects from LD_PRELOAD.  */
   const char *preloadlist;
 
@@ -94,7 +97,7 @@ struct dl_main_state
 static inline void
 call_init_paths (const struct dl_main_state *state)
 {
-  _dl_init_paths (state->library_path);
+  _dl_init_paths (state->library_path, state->library_path_source);
 }
 
 /* Print ld.so usage information and exit.  */