2019-08-12 06:30:28 +00:00
|
|
|
--- a/elf/Makefile
|
|
|
|
+++ b/elf/Makefile
|
|
|
|
@@ -589,13 +589,13 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
|
2012-09-18 12:38:43 -04:00
|
|
|
|
2015-03-02 21:24:55 +01:00
|
|
|
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
|
2012-09-18 12:38:43 -04:00
|
|
|
|
|
|
|
-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
|
2018-02-18 16:52:44 -05:00
|
|
|
-CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
|
2012-09-18 12:38:43 -04:00
|
|
|
+PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
|
2018-02-18 16:52:44 -05:00
|
|
|
+CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
|
2015-03-02 21:24:55 +01:00
|
|
|
-D'SLIBDIR="$(slibdir)"'
|
|
|
|
libof-ldconfig = ldconfig
|
2018-02-18 16:52:44 -05:00
|
|
|
-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)
|
|
|
|
-CFLAGS-cache.c += $(SYSCONF-FLAGS)
|
|
|
|
-CFLAGS-rtld.c += $(SYSCONF-FLAGS)
|
|
|
|
+CFLAGS-dl-cache.c += $(PREFIX-FLAGS)
|
|
|
|
+CFLAGS-cache.c += $(PREFIX-FLAGS)
|
|
|
|
+CFLAGS-rtld.c += $(PREFIX-FLAGS)
|
2012-09-18 12:38:43 -04:00
|
|
|
|
2015-03-02 21:24:55 +01:00
|
|
|
cpp-srcs-left := $(all-rtld-routines:=.os)
|
|
|
|
lib := rtld
|
2019-08-12 06:30:28 +00:00
|
|
|
--- a/elf/ldconfig.c
|
|
|
|
+++ b/elf/ldconfig.c
|
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef LD_SO_CONF
|
|
|
|
-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
|
|
|
|
+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Get libc version number. */
|
|
|
|
--- a/sysdeps/generic/dl-cache.h
|
|
|
|
+++ b/sysdeps/generic/dl-cache.h
|
2012-09-18 12:38:43 -04:00
|
|
|
@@ -28,7 +28,7 @@
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef LD_SO_CACHE
|
|
|
|
-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
|
|
|
|
+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef add_system_dir
|