2006-01-21 Aurelien Jarno * Makeconfig: new configuration variable rtlddir to change the dynamic linker in the ELF binaries, which defaults to slibdir 2005-08-30 Andreas Jochen * Makeconfig: use rtlddir instead of slibdir * elf/Makefile: likewise --- Makeconfig | 7 ++++++- elf/Makefile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) --- a/Makeconfig +++ b/Makeconfig @@ -202,6 +202,11 @@ endif inst_slibdir = $(install_root)$(slibdir) +# Directory of the dynamic linker in the ELF binaries +ifndef rtlddir +rtlddir := $(slibdir) +endif + # Prefix to put on files installed in $(libdir). For libraries `libNAME.a', # the prefix is spliced between `lib' and the name, so the linker switch # `-l$(libprefix)NAME' finds the library; for other files the prefix is @@ -465,7 +470,7 @@ endif ifndef config-LDFLAGS ifeq (yesyes,$(build-shared)$(elf)) -config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name) +config-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name) endif endif ifndef link-libc --- a/elf/Makefile +++ b/elf/Makefile @@ -320,7 +320,7 @@ | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }' # interp.c exists just to get this string into the libraries. -CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \ +CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \ -DNOT_IN_libc=1 $(objpfx)interp.os: $(common-objpfx)config.make