aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-11-14 23:01:07 -0500
committerMike Frysinger <vapier@gentoo.org>2016-11-14 23:01:07 -0500
commit7aeb66e8ab261007a95fd0fee0f573d6aede496d (patch)
tree990dff7100106b73171cd0be58c5d2626f477019 /paxldso.c
parentpaxldso: fix building when ldso support is disabled (diff)
downloadpax-utils-7aeb66e8ab261007a95fd0fee0f573d6aede496d.tar.gz
pax-utils-7aeb66e8ab261007a95fd0fee0f573d6aede496d.tar.bz2
pax-utils-7aeb66e8ab261007a95fd0fee0f573d6aede496d.zip
paxldso: always expose ldpaths array
This fixes building when ldso config logic is unavailable since consumers (like scanelf) always attempt to walk the array. Changing the code to be an empty array by default so it won't suck up too much space when support isn't available.
Diffstat (limited to 'paxldso.c')
-rw-r--r--paxldso.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/paxldso.c b/paxldso.c
index 93eaf97..ce64e6c 100644
--- a/paxldso.c
+++ b/paxldso.c
@@ -235,11 +235,11 @@ static void ldso_cache_cleanup(void)
* ld.so.conf logic
*/
-#if PAX_LDSO_CONFIG
-
static array_t _ldpaths = array_init_decl;
array_t *ldpaths = &_ldpaths;
+#if PAX_LDSO_CONFIG
+
#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__)
int ldso_config_load(const char *fname)