diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-01-02 02:24:49 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-01-02 03:01:41 -0500 |
| commit | b3436addb5ccf14d7fffcf5503644e9a62aaec4e (patch) | |
| tree | 3c0d17eda4f2f492a7ddfbd3f68b74383c6004c3 /ldso/include/ldso.h | |
| parent | d5fd9afa76176c889196bb0631bfed77431b295d (diff) | |
ldso: simplify interp path search logic
The setup logic is duplicated, so unify it in a local func.
Mark the variable const while we're doing this, and add missing
ifdef protection to the header that declares it availability.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ldso/include/ldso.h')
| -rw-r--r-- | ldso/include/ldso.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 4c091779d..6f3b728c3 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -73,7 +73,9 @@ struct init_fini_list { /* Global variables used within the shared library loader */ extern char *_dl_library_path; /* Where we look for libraries */ extern char *_dl_preload; /* Things to be loaded before the libs */ -extern char *_dl_ldsopath; /* Where the shared lib loader was found */ +#ifdef __LDSO_SEARCH_INTERP_PATH__ +extern const char *_dl_ldsopath; /* Where the shared lib loader was found */ +#endif extern const char *_dl_progname; /* The name of the executable being run */ extern size_t _dl_pagesize; /* Store the page size for use later */ #ifdef __LDSO_PRELINK_SUPPORT__ |