diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-10-08 10:57:10 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-10-08 13:38:23 +0200 |
| commit | 9590a71adcf134c77f2d0f5711b0d6ab1b4193e6 (patch) | |
| tree | 3090de58f9efc3f0e9a3c7c27d1bcd7caa26b8e7 /elf/Makefile | |
| parent | 2bf9e641fd50ec34b04b70829679abf64fc0ed78 (diff) | |
| download | glibc-9590a71adcf134c77f2d0f5711b0d6ab1b4193e6.tar.gz glibc-9590a71adcf134c77f2d0f5711b0d6ab1b4193e6.tar.xz glibc-9590a71adcf134c77f2d0f5711b0d6ab1b4193e6.zip | |
elf: Move ld.so error/help output to _dl_usage
Also add a comment to elf/Makefile, explaining why we cannot use config.status for autoconf template processing. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile index 6a76beb719..8cdc44fdf1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -59,7 +59,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \ # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \ - dl-error-minimal dl-conflict dl-hwcaps + dl-error-minimal dl-conflict dl-hwcaps dl-usage all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables @@ -618,6 +618,12 @@ ldso_install: $(inst_rtlddir)/$(rtld-installed-name) endif +# Workarounds for ${exec_prefix} expansion in configure variables. +# config.status cannot be used directly for processing ldd.bash.in or +# expanding variables such as sysconfdir because the expansion +# contains the literal string ${exec_prefix}, which is not valid in C +# headers or installed shell scripts. + ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ @@ -655,6 +661,7 @@ libof-ldconfig = ldconfig CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) CFLAGS-cache.c += $(SYSCONF-FLAGS) CFLAGS-rtld.c += $(SYSCONF-FLAGS) +CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld |