From 2e4d3492e6627fc9d4c34de104a6ebe6f84ac1e9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 14 Mar 2017 23:24:14 -0700 Subject: Search the configured multilib ... before falling back to ld.so installation path (it is not the same - gcc uses /lib/ld-uClibc-x86-64.so.0 for uClibc) or default /lib:/usr/lib. This matches glibc behavior (see trusted-dirs.h generated during glibc build). Signed-off-by: Alexey Neyman --- ldso/ldso/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ldso/ldso/Makefile.in') diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 993aeb9d9..320e4488b 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -34,6 +34,11 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" +# Search non-default multilib directories +ifneq ($(MULTILIB_DIR),lib) +CFLAGS-ldso.c += -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\" +endif + ifeq ($(TARGET_ARCH),arc) CFLAGS-ldso.c += -mno-long-calls endif -- cgit v1.2.3