diff options
| author | Roland McGrath <roland@gnu.org> | 1995-11-16 02:37:06 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-11-16 02:37:06 +0000 |
| commit | 8738e7f8b0c6d6254a31450dc528bddc8bdae0f7 (patch) | |
| tree | 5e7e75d0e75996d699cfdeb09575a4fcb6e57c59 /elf/Makefile | |
| parent | ec967c06ac7474fa58266ea309d6488ee3c53851 (diff) | |
| download | glibc-8738e7f8b0c6d6254a31450dc528bddc8bdae0f7.tar.gz glibc-8738e7f8b0c6d6254a31450dc528bddc8bdae0f7.tar.xz glibc-8738e7f8b0c6d6254a31450dc528bddc8bdae0f7.zip | |
* elf/dl-lookup.c (_dl_lookup_symbol): Undefined symbol is no cvs/libc-951116
error if weak. * elf/Makefile (default-rpath): New variable. (CPPFLAGS): Append -DDEFAULT_RPATH=.... * elf/dl-load.c (_dl_map_object): Use DEFAULT_RPATH instead of hard-coded "/lib:/usr/lib".
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index 08288f89d5..a37e95d2c5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -50,6 +50,16 @@ endif include ../Rules +# Choose the default search path for the dynamic linker based on +# where we will install libraries. +ifneq ($(libdir),$(slibdir)) +default-rpath = $(slibdir):$(libdir) +else +default-rpath = $(libdir) +endif +CPPFLAGS += -DDEFAULT_RPATH='"$(default-rpath)"' + + # Link together the dynamic linker into a single relocatable object. # We use this to produce both the ABI-compliant and Linux-compatible # dynamic linker shared objects below. |