From a23db8e4af794430fe69c17bd884f03669d307d7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 16 Jun 1996 01:27:54 +0000 Subject: Sat Jun 15 18:13:43 1996 Roland McGrath * sysdeps/unix/sysv/linux/Dist: Add sys/klog.h. * elf/dl-open.c (_dl_open): Remove PARENT argument, pass null. * elf/link.h: Update prototype. * elf/dl-load.c (_dl_map_object): If dependents' DT_RPATHs don't find NAME, try the DT_RPATH of the executable itself if dynamic. * elf/dlopen.c (dlopen): Don't pass first arg to _dl_open. * elf/dl-load.c (_dl_map_object): Exit DT_RPATH checking loop when an open succeeds. * Makerules (build-shlib): Give -L opts for each elt of $(rpath-link). * sysdeps/mach/hurd/Makefile (sysdep-LDFLAGS): Variable removed. (rpath-link): Append to this instead. --- sysdeps/mach/hurd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sysdeps/mach/hurd/Makefile') diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index f4b590a06b..bbee3faa65 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -104,7 +104,9 @@ endif # For the shared library, we don't need to do the linker script machination. # Instead, we specify the required libraries when building the shared object. LDLIBS-c.so = -lmachuser -lhurduser -sysdep-LDFLAGS += -Wl,-rpath-link=$(..)mach:$(..)hurd +ifndef objpfx +rpath-link += $(..)mach:$(..)hurd +endif endif # in-Makerules -- cgit v1.2.3